diff options
| -rw-r--r-- | app/src/build.py | 2 | ||||
| -rw-r--r-- | app/src/models.py | 4 | ||||
| -rw-r--r-- | app/syndication/models.py | 2 | ||||
| -rw-r--r-- | app/syndication/syndicators.py | 14 | ||||
| -rw-r--r-- | config/base_urls.py | 4 | ||||
| -rw-r--r-- | design/templates/src_base.html | 1 |
6 files changed, 12 insertions, 15 deletions
diff --git a/app/src/build.py b/app/src/build.py index ec79458..e6119e7 100644 --- a/app/src/build.py +++ b/app/src/build.py @@ -38,7 +38,7 @@ class BuildSrc(BuildNew): def builder(): - j = BuildSrc("src", "entry") + j = BuildSrc("src", "post") j.build() diff --git a/app/src/models.py b/app/src/models.py index ce78c24..fc0a5fc 100644 --- a/app/src/models.py +++ b/app/src/models.py @@ -74,7 +74,7 @@ class Post(models.Model): def save(self): md = image_url_replace(self.body_markdown) self.body_html = markdown_to_html(md) - super(Entry, self).save() + super(Post, self).save() def get_upload_path(self, filename): @@ -160,7 +160,7 @@ class SrcSitemap(Sitemap): def items(self): return list(chain( - Entry.objects.all(), + Post.objects.all(), Book.objects.all(), Topic.objects.all() )) diff --git a/app/syndication/models.py b/app/syndication/models.py index 2be7237..c348c1b 100644 --- a/app/syndication/models.py +++ b/app/syndication/models.py @@ -74,7 +74,7 @@ def post_save_events(sender, update_fields, created, instance, **kwargs): instance.status = 2 if item.name == "Twitter": print("calling function") - #post_to_twitter(instance.content_object, instance.content_type.name) + post_to_twitter(instance.content_object, instance.content_type.name) if item.name == "Flickr": if instance.content_type.name == "lux image": post_photo_to_flickr(instance.content_object) diff --git a/app/syndication/syndicators.py b/app/syndication/syndicators.py index 764f455..5f8762c 100644 --- a/app/syndication/syndicators.py +++ b/app/syndication/syndicators.py @@ -73,9 +73,10 @@ def post_to_twitter(obj, ctype): loop = loop+1 if loop == 3: break - soup.find_all('img').replaceWith("") + for t in soup.find_all('img'): + t.replaceWith("") # truncate message - if status.length > 140: + if len(status) > 140: try: status = status.split("|")[0] + obj.get_absolute_url() except: @@ -84,15 +85,12 @@ def post_to_twitter(obj, ctype): try: geo = t.reverse_geocode(lat=obj.latitude, lon=obj.longitude, accuracy=1500, granularity="city") geo_id = geo['result']['places'][0]['id'] - except: - pass - try: - status = t.update_status(status=status, media_ids=[img['media_id'] for img in imgs], place_id=geo_id) + tweet = t.update_status(status=status, media_ids=[img['media_id'] for img in imgs], place_id=geo_id) except: try: - status = t.update_status(status=status, media_ids=[img['media_id'] for img in imgs]) + tweet = t.update_status(status=status, media_ids=[img['media_id'] for img in imgs]) except: - status = t.update_status(status=status) + tweet = t.update_status(status=status) def post_photo_to_flickr(photo): diff --git a/config/base_urls.py b/config/base_urls.py index 9cc2186..0f63a75 100644 --- a/config/base_urls.py +++ b/config/base_urls.py @@ -65,6 +65,7 @@ urlpatterns += [ ), # facebook ia feed url(r'^iafeed.xml$', FacebookFeedView.as_view()), + url(r'^comments/', include('django_comments.urls')), # pages url(r'^(?P<slug>[-\w]+)/?$', PageDetailView.as_view()), url(r'^(?P<path>[-\w]+)/(?P<slug>[-\w]+)?$', PageDetailView.as_view()), @@ -77,6 +78,3 @@ urlpatterns += [ {'document_root': settings.STATIC_ROOT, } ), ] -urlpatterns += [ - url(r'^comments/', include('django_comments.urls')), -] diff --git a/design/templates/src_base.html b/design/templates/src_base.html index 6d5dc34..98e84d7 100644 --- a/design/templates/src_base.html +++ b/design/templates/src_base.html @@ -54,6 +54,7 @@ © 2003-{% now "Y" %} <span class="h-card"><a class="p-name u-url" href="https://luxagraf.net/">Scott Gilbertson</a><data class="p-nickname" value="luxagraf"></data><data class="p-locality" value="Athens"></data><data class="p-region" value="Georgia"></data><data class="p-country-name" value="United States"></data></span>, except photos, which are licensed under the Creative Commons (<a href="http://creativecommons.org/licenses/by-sa/3.0/" title="read the Attribution-Share Alike 3.0 deed">details</a>). </p> + <p><a href="https://evolution-host.com/ssd-vps-hosting.php">SSD VPS Hosting by Evolution Host</a>.</p> </footer> </div> {% block js %}{% endblock%} |