diff --git a/apps/reader/views.py b/apps/reader/views.py index 4a8a002f3..bc9b9244a 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -172,7 +172,7 @@ def signup(request): url = "https://%s%s" % (Site.objects.get_current().domain, reverse('stripe-form')) return HttpResponseRedirect(url) - + return index(request) @never_cache diff --git a/apps/social/models.py b/apps/social/models.py index f6bd2b03f..208961ec4 100644 --- a/apps/social/models.py +++ b/apps/social/models.py @@ -1917,18 +1917,22 @@ class MSharedStory(mongo.Document): self.guid_hash[:6] ) - def generate_post_to_service_message(self, include_url=True): + def generate_post_to_service_message(self, truncate=None, include_url=True): message = strip_tags(self.comments) if not message or len(message) < 1: message = self.decoded_story_title - if include_url: - message = truncate_chars(message, 92) + if include_url and truncate: + message = truncate_chars(message, truncate - 18 - 30) feed = Feed.get_by_id(self.story_feed_id) - message += " (%s)" % truncate_chars(feed.feed_title, 18) + if truncate: + message += " (%s)" % truncate_chars(feed.feed_title, 18) + else: + message += " (%s)" % truncate_chars(feed.feed_title, 30) if include_url: message += " " + self.blurblog_permalink() elif include_url: - message = truncate_chars(message, 116) + if truncate: + message = truncate_chars(message, truncate - 14) message += " " + self.blurblog_permalink() return message @@ -2527,7 +2531,7 @@ class MSocialServices(mongo.Document): return profile def post_to_twitter(self, shared_story): - message = shared_story.generate_post_to_service_message() + message = shared_story.generate_post_to_service_message(truncate=140) try: api = self.twitter_api() @@ -2561,7 +2565,7 @@ class MSocialServices(mongo.Document): return True def post_to_appdotnet(self, shared_story): - message = shared_story.generate_post_to_service_message() + message = shared_story.generate_post_to_service_message(truncate=256) try: api = self.appdotnet_api()