-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
User tagging in chats #203
Open
juliawuu
wants to merge
5
commits into
haystack:master
Choose a base branch
from
juliawuu:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
2641c4c
Added previous commenters to list of suggested users to tag in chats.
a5c5797
Merge branch 'master' of https://github.com/haystack/eyebrowse-server
f82f773
Changed placement of id_list and added >= 10.
fe3c34a
Minor changes
2fde17b
Minor changes
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -224,6 +224,26 @@ def get_friends(request): | |
'type': 'contact'}) | ||
if len(data) > 5: | ||
break | ||
|
||
url = request.GET.get('url', '') | ||
|
||
messages = ChatMessage.objects.filter(url=url).order_by('-date').select_related() | ||
|
||
id_list = [] | ||
for suggested_user in data: | ||
id_list.append(suggested_user['id']) | ||
|
||
for message in messages: | ||
commenter = message.author | ||
if not query or query in commenter.username.lower(): | ||
if commenter.userprofile.id not in id_list: | ||
id_list.append(commenter.userprofile.id) | ||
data.append({'id': commenter.userprofile.id, | ||
'name': '@%s' % (commenter.username), | ||
'avatar': gravatar_for_user(commenter), | ||
'type': 'contact'}) | ||
if len(data) > 10: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shouldn't it be >= 10? (if we want a maximum of 10 results). |
||
break | ||
|
||
return {'res': data} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not just create id_list above and add an append inside the for loop where items get added to data?