Register the twitter username of blogs (if any), and include
authorMagnus Hagander <magnus@hagander.net>
Sun, 30 Aug 2009 12:37:04 +0000 (14:37 +0200)
committerMagnus Hagander <magnus@hagander.net>
Sun, 30 Aug 2009 12:37:04 +0000 (14:37 +0200)
this in the posted tweets.
No way for user to edit his/her own name yet though, that remains
a TODO.

hamnadmin/register/models.py
posttotwitter.py
schema.sql

index bb05bdfa5c656a5d48f168e693f198929c448228..f3042cf13376c181cde3c4223b98545e0e46e070 100644 (file)
@@ -24,6 +24,7 @@ class Blog(models.Model):
        approved = models.BooleanField()
        authorfilter = models.CharField(max_length=255,default='',blank=True)
        team = models.ForeignKey(Team,db_column='team', blank=True, null=True)
+       twitteruser = models.CharField(max_length=255, default='', blank=True)
 
        def __unicode__(self):
                return "%s (%s)" % (self.name, self.feedurl)
index 70967e430ae8c98a42c44e05e3e77739c07fa6cd..c02fd8edcf0b641ef30e937b483490d7c5000443 100755 (executable)
@@ -41,7 +41,7 @@ class PostToTwitter:
 
        def Run(self):
                c = self.db.cursor()
-               c.execute("""SELECT posts.id, posts.title, posts.link, posts.shortlink, feeds.name
+               c.execute("""SELECT posts.id, posts.title, posts.link, posts.shortlink, feeds.name, feeds.twitteruser
                             FROM planet.posts INNER JOIN planet.feeds ON planet.posts.feed=planet.feeds.id
                             WHERE approved AND NOT (twittered OR hidden) ORDER BY dat""")
                for post in c.fetchall():
@@ -64,11 +64,20 @@ class PostToTwitter:
                                self.db.commit()
 
                        # Set up the string to twitter
-                       msg = "%s: %s %s" % (
-                               post[4],
-                               self.trimpost(post[1],len(post[4])+len(short)+3),
-                               short,
-                       )
+                       if post[5] and len(post[5])>1:
+                               # Twitter username registered
+                               msg = "%s (@%s): %s %s" % (
+                                       post[4],
+                                       post[5],
+                                       self.trimpost(post[1],len(post[4])+len(post[5])+len(short)+7),
+                                       short,
+                               )
+                       else:
+                               msg = "%s: %s %s" % (
+                                       post[4],
+                                       self.trimpost(post[1],len(post[4])+len(short)+3),
+                                       short,
+                               )
 
                        # Now post it to twitter
                        try:
index beedb823e0e91deafd02cb2d6e1c449f13b85639..80c9df251ef6dda7726674244c49698673ab411f 100644 (file)
@@ -46,7 +46,8 @@ CREATE TABLE feeds (
     lastget timestamp with time zone DEFAULT '2000-01-01 00:00:00+00'::timestamp with time zone NOT NULL,
     userid text,
     approved boolean DEFAULT false NOT NULL,
-    authorfilter text DEFAULT ''::text NOT NULL
+    authorfilter text DEFAULT ''::text NOT NULL,
+    twitteruser text DEFAULT ''::text NOT NULL
 );