Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
DEKHTIARJonathan committed Sep 11, 2018
2 parents 6de6c8e + b7feceb commit 9fcef2d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions feedcrunch_api_v1/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ def post(self, request, apikey=""):
link = unicodedata.normalize('NFC', request.POST['link'])

# We separate each tag and create a list out of it.
tags = unicodedata.normalize('NFC', request.POST['tags']).split(',')
tags = unicodedata.normalize('NFC', request.POST['tags']).split(',')

activated_bool = str2bool(unicodedata.normalize('NFC', request.POST['activated']))

Expand Down Expand Up @@ -615,16 +615,16 @@ def post(self, request, apikey=""):
RSSArticle_Assoc_obj.save()

if twitter_bool and user.is_social_network_enabled(network="twitter"):
tasks.publish_on_twitter.delay(idArticle=tmp_post.id)
tasks.publish_on_twitter.delay(id_article=tmp_post.id)

if facebook_bool and user.is_social_network_enabled(network="facebook"):
tasks.publish_on_facebook.delay(idArticle=tmp_post.id)
tasks.publish_on_facebook.delay(id_article=tmp_post.id)

if linkedin_bool and user.is_social_network_enabled(network="linkedin"):
tasks.publish_on_linkedin.delay(idArticle=tmp_post.id)
tasks.publish_on_linkedin.delay(id_article=tmp_post.id)

if slack_bool and user.is_social_network_enabled(network="slack"):
tasks.publish_on_slack.delay(idArticle=tmp_post.id)
tasks.publish_on_slack.delay(id_article=tmp_post.id)

payload["success"] = True
payload["post_id"] = str(tmp_post.id)
Expand Down Expand Up @@ -695,16 +695,16 @@ def put(self, request, post_id=None):
tmp_post.save()

if twitter_bool and request.user.is_social_network_enabled(network="twitter"):
tasks.publish_on_twitter.delay(idArticle=tmp_post.id)
tasks.publish_on_twitter.delay(id_article=tmp_post.id)

if facebook_bool and request.user.is_social_network_enabled(network="facebook"):
tasks.publish_on_facebook.delay(idArticle=tmp_post.id)
tasks.publish_on_facebook.delay(id_article=tmp_post.id)

if linkedin_bool and request.user.is_social_network_enabled(network="linkedin"):
tasks.publish_on_linkedin.delay(idArticle=tmp_post.id)
tasks.publish_on_linkedin.delay(id_article=tmp_post.id)

if slack_bool and request.user.is_social_network_enabled(network="slack"):
tasks.publish_on_slack.delay(idArticle=tmp_post.id)
tasks.publish_on_slack.delay(id_article=tmp_post.id)

payload["success"] = True
payload["post_id"] = str(post_id)
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ kombu==4.2.1
lxml==4.2.4
numpy==1.15.1
oauthlib==2.1.0
olefile==0.45.1
olefile==0.46
pandas==0.23.4
Pillow==5.2.0
psycopg2-binary==2.7.5
Expand Down

0 comments on commit 9fcef2d

Please sign in to comment.