fergalmoran/dss.api
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.api.git synced 2025-12-22 17:28:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Fergal Moran
2016-06-20 21:56:44 +01:00
parent 11aa58c288 12b5b32e35
commit e7bd7a8df6
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spa/models/activity.py
View File

@@ -12,7 +12,7 @@ from dss import settings
from spa.models.notification import Notification from spa.models.notification import Notification
from spa.models.userprofile import UserProfile from spa.models.userprofile import UserProfile
from spa.models.basemodel import BaseModel from spa.models.basemodel import BaseModel
import json
ACTIVITYTYPES = ( ACTIVITYTYPES = (
('p', 'played'), ('p', 'played'),
@@ -51,7 +51,8 @@ class Activity(BaseModel):
action_type = "deepsouthsounds:play" action_type = "deepsouthsounds:play"
if False: if False:
social_account = SocialToken.objects.filter(account__user=self.user.user, account__provider='facebook')[0] social_account = SocialToken.objects.filter(account__user=self.user.user, account__provider='facebook')[
0]
facebook = OpenFacebook(social_account.token) facebook = OpenFacebook(social_account.token)
notification_html = { notification_html = {
object: wrap_full(self.get_object_url()) object: wrap_full(self.get_object_url())
@@ -65,10 +66,15 @@ class Activity(BaseModel):
def post_broadcast(self): def post_broadcast(self):
try: try:
display_name = self.user.display_name if self.user is not None else 'Anonymous' display_name = self.user.display_name if self.user is not None else 'Anonymous'
notice = "{} {} {}".format( image = self.user.get_avatar_image() if self.user is not None else settings.DEFAULT_USER_IMAGE
notice = json.dumps({
'image': image,
'title': 'New Activity',
'body': "{} {} {}".format(
display_name, display_name,
self.get_verb_past(), self.get_verb_past(),
self.get_object_name()) self.get_object_name())
})
target_user = self.get_target_user() target_user = self.get_target_user()
realtime.post_activity('user:broadcast', notice, target_user.get_session_id()) realtime.post_activity('user:broadcast', notice, target_user.get_session_id())
except Exception as ex: except Exception as ex: