2020-06-11 00:54:34 +02:00
|
|
|
from typing import Any, Dict, Set
|
|
|
|
|
2018-12-17 22:04:07 +01:00
|
|
|
import ujson
|
|
|
|
|
2020-06-11 00:54:34 +02:00
|
|
|
from zerver.lib.test_classes import ZulipTestCase
|
|
|
|
from zerver.lib.test_helpers import EventInfo, capture_event
|
|
|
|
from zerver.lib.user_status import get_user_info_dict, update_user_status
|
|
|
|
from zerver.models import UserProfile, UserStatus, get_client
|
2018-12-17 16:19:18 +01:00
|
|
|
|
2019-01-21 19:06:03 +01:00
|
|
|
|
|
|
|
def get_away_user_ids(realm_id: int) -> Set[int]:
|
|
|
|
user_dict = get_user_info_dict(realm_id)
|
|
|
|
|
|
|
|
return {
|
|
|
|
user_id
|
|
|
|
for user_id in user_dict
|
|
|
|
if user_dict[user_id].get('away')
|
|
|
|
}
|
|
|
|
|
|
|
|
def user_info(user: UserProfile) -> Dict[str, Any]:
|
|
|
|
user_dict = get_user_info_dict(user.realm_id)
|
|
|
|
return user_dict.get(user.id, dict())
|
2018-12-17 22:04:07 +01:00
|
|
|
|
2018-12-17 16:19:18 +01:00
|
|
|
class UserStatusTest(ZulipTestCase):
|
|
|
|
def test_basics(self) -> None:
|
|
|
|
cordelia = self.example_user('cordelia')
|
|
|
|
hamlet = self.example_user('hamlet')
|
|
|
|
king_lear = self.lear_user('king')
|
|
|
|
|
|
|
|
realm_id = hamlet.realm_id
|
|
|
|
|
|
|
|
away_user_ids = get_away_user_ids(realm_id=realm_id)
|
|
|
|
self.assertEqual(away_user_ids, set())
|
|
|
|
|
|
|
|
client1 = get_client('web')
|
|
|
|
client2 = get_client('ZT')
|
|
|
|
|
2019-01-21 18:19:59 +01:00
|
|
|
update_user_status(
|
2018-12-17 16:19:18 +01:00
|
|
|
user_profile_id=hamlet.id,
|
2019-01-21 18:19:59 +01:00
|
|
|
status=UserStatus.AWAY,
|
2019-01-21 19:06:03 +01:00
|
|
|
status_text=None,
|
2018-12-17 16:19:18 +01:00
|
|
|
client_id=client1.id,
|
|
|
|
)
|
|
|
|
|
|
|
|
away_user_ids = get_away_user_ids(realm_id=realm_id)
|
|
|
|
self.assertEqual(away_user_ids, {hamlet.id})
|
|
|
|
|
|
|
|
# Test that second client just updates
|
|
|
|
# the record. We only store one record
|
|
|
|
# per user. The user's status transcends
|
|
|
|
# clients; we only store the client for
|
|
|
|
# reference and to maybe reconcile timeout
|
|
|
|
# situations.
|
2019-01-21 18:19:59 +01:00
|
|
|
update_user_status(
|
2018-12-17 16:19:18 +01:00
|
|
|
user_profile_id=hamlet.id,
|
2019-01-21 18:19:59 +01:00
|
|
|
status=UserStatus.AWAY,
|
2019-01-21 19:06:03 +01:00
|
|
|
status_text='out to lunch',
|
2018-12-17 16:19:18 +01:00
|
|
|
client_id=client2.id,
|
|
|
|
)
|
|
|
|
|
2019-01-21 19:06:03 +01:00
|
|
|
self.assertEqual(
|
|
|
|
user_info(hamlet),
|
|
|
|
dict(away=True, status_text='out to lunch'),
|
|
|
|
)
|
|
|
|
|
2018-12-17 16:19:18 +01:00
|
|
|
away_user_ids = get_away_user_ids(realm_id=realm_id)
|
|
|
|
self.assertEqual(away_user_ids, {hamlet.id})
|
|
|
|
|
|
|
|
rec_count = UserStatus.objects.filter(user_profile_id=hamlet.id).count()
|
|
|
|
self.assertEqual(rec_count, 1)
|
|
|
|
|
2019-01-21 19:06:03 +01:00
|
|
|
# Setting status_text to None causes it be ignored.
|
2019-01-21 18:19:59 +01:00
|
|
|
update_user_status(
|
2018-12-17 16:19:18 +01:00
|
|
|
user_profile_id=hamlet.id,
|
2019-01-21 18:19:59 +01:00
|
|
|
status=UserStatus.NORMAL,
|
2019-01-21 19:06:03 +01:00
|
|
|
status_text=None,
|
|
|
|
client_id=client2.id,
|
|
|
|
)
|
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
user_info(hamlet),
|
|
|
|
dict(status_text='out to lunch'),
|
|
|
|
)
|
|
|
|
|
|
|
|
# Clear the status_text now.
|
|
|
|
update_user_status(
|
|
|
|
user_profile_id=hamlet.id,
|
|
|
|
status=None,
|
|
|
|
status_text='',
|
2019-01-21 18:19:59 +01:00
|
|
|
client_id=client2.id,
|
2018-12-17 16:19:18 +01:00
|
|
|
)
|
|
|
|
|
2019-01-21 19:06:03 +01:00
|
|
|
self.assertEqual(
|
|
|
|
user_info(hamlet),
|
|
|
|
dict(),
|
|
|
|
)
|
|
|
|
|
2018-12-17 16:19:18 +01:00
|
|
|
away_user_ids = get_away_user_ids(realm_id=realm_id)
|
|
|
|
self.assertEqual(away_user_ids, set())
|
|
|
|
|
|
|
|
# Now set away status for three different users across
|
|
|
|
# two realms.
|
2019-01-21 18:19:59 +01:00
|
|
|
update_user_status(
|
2018-12-17 16:19:18 +01:00
|
|
|
user_profile_id=hamlet.id,
|
2019-01-21 18:19:59 +01:00
|
|
|
status=UserStatus.AWAY,
|
2019-01-21 19:06:03 +01:00
|
|
|
status_text=None,
|
2018-12-17 16:19:18 +01:00
|
|
|
client_id=client1.id,
|
|
|
|
)
|
2019-01-21 18:19:59 +01:00
|
|
|
update_user_status(
|
2018-12-17 16:19:18 +01:00
|
|
|
user_profile_id=cordelia.id,
|
2019-01-21 18:19:59 +01:00
|
|
|
status=UserStatus.AWAY,
|
2019-01-21 19:06:03 +01:00
|
|
|
status_text=None,
|
2018-12-17 16:19:18 +01:00
|
|
|
client_id=client2.id,
|
|
|
|
)
|
2019-01-21 18:19:59 +01:00
|
|
|
update_user_status(
|
2018-12-17 16:19:18 +01:00
|
|
|
user_profile_id=king_lear.id,
|
2019-01-21 18:19:59 +01:00
|
|
|
status=UserStatus.AWAY,
|
2019-01-21 19:06:03 +01:00
|
|
|
status_text=None,
|
2018-12-17 16:19:18 +01:00
|
|
|
client_id=client2.id,
|
|
|
|
)
|
|
|
|
|
|
|
|
away_user_ids = get_away_user_ids(realm_id=realm_id)
|
|
|
|
self.assertEqual(away_user_ids, {cordelia.id, hamlet.id})
|
|
|
|
|
|
|
|
away_user_ids = get_away_user_ids(realm_id=king_lear.realm.id)
|
|
|
|
self.assertEqual(away_user_ids, {king_lear.id})
|
|
|
|
|
2019-01-21 19:06:03 +01:00
|
|
|
# Set Hamlet to NORMAL but in a meeting.
|
2019-01-21 18:19:59 +01:00
|
|
|
update_user_status(
|
2018-12-17 16:19:18 +01:00
|
|
|
user_profile_id=hamlet.id,
|
2019-01-21 18:19:59 +01:00
|
|
|
status=UserStatus.NORMAL,
|
2019-01-21 19:06:03 +01:00
|
|
|
status_text='in a meeting',
|
2019-01-21 18:19:59 +01:00
|
|
|
client_id=client2.id,
|
2018-12-17 16:19:18 +01:00
|
|
|
)
|
|
|
|
|
2019-01-21 19:06:03 +01:00
|
|
|
self.assertEqual(
|
|
|
|
user_info(hamlet),
|
python: Use trailing commas consistently.
Automatically generated by the following script, based on the output
of lint with flake8-comma:
import re
import sys
last_filename = None
last_row = None
lines = []
for msg in sys.stdin:
m = re.match(
r"\x1b\[35mflake8 \|\x1b\[0m \x1b\[1;31m(.+):(\d+):(\d+): (\w+)", msg
)
if m:
filename, row_str, col_str, err = m.groups()
row, col = int(row_str), int(col_str)
if filename == last_filename:
assert last_row != row
else:
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
with open(filename) as f:
lines = f.readlines()
last_filename = filename
last_row = row
line = lines[row - 1]
if err in ["C812", "C815"]:
lines[row - 1] = line[: col - 1] + "," + line[col - 1 :]
elif err in ["C819"]:
assert line[col - 2] == ","
lines[row - 1] = line[: col - 2] + line[col - 1 :].lstrip(" ")
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-10 05:23:40 +02:00
|
|
|
dict(status_text='in a meeting'),
|
2019-01-21 19:06:03 +01:00
|
|
|
)
|
|
|
|
|
2018-12-17 16:19:18 +01:00
|
|
|
away_user_ids = get_away_user_ids(realm_id=realm_id)
|
|
|
|
self.assertEqual(away_user_ids, {cordelia.id})
|
2018-12-17 22:04:07 +01:00
|
|
|
|
|
|
|
def test_endpoints(self) -> None:
|
|
|
|
hamlet = self.example_user('hamlet')
|
|
|
|
realm_id = hamlet.realm_id
|
|
|
|
|
2020-03-06 18:40:46 +01:00
|
|
|
self.login_user(hamlet)
|
2018-12-17 22:04:07 +01:00
|
|
|
|
|
|
|
# Try to omit parameter--this should be an error.
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
payload: Dict[str, Any] = dict()
|
2018-12-17 22:04:07 +01:00
|
|
|
result = self.client_post('/json/users/me/status', payload)
|
2019-01-21 19:06:03 +01:00
|
|
|
self.assert_json_error(result, "Client did not pass any new values.")
|
2018-12-17 22:04:07 +01:00
|
|
|
|
2019-01-21 19:06:03 +01:00
|
|
|
# Try a long message.
|
|
|
|
long_text = 'x' * 61
|
|
|
|
payload = dict(status_text=long_text)
|
|
|
|
result = self.client_post('/json/users/me/status', payload)
|
|
|
|
self.assert_json_error(result, "status_text is too long (limit: 60 characters)")
|
|
|
|
|
|
|
|
payload = dict(
|
|
|
|
away=ujson.dumps(True),
|
|
|
|
status_text='on vacation',
|
|
|
|
)
|
2018-12-17 22:04:07 +01:00
|
|
|
|
|
|
|
event_info = EventInfo()
|
|
|
|
with capture_event(event_info):
|
|
|
|
result = self.client_post('/json/users/me/status', payload)
|
|
|
|
self.assert_json_success(result)
|
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
event_info.payload,
|
2019-01-21 19:06:03 +01:00
|
|
|
dict(type='user_status', user_id=hamlet.id, away=True, status_text='on vacation'),
|
2018-12-17 22:04:07 +01:00
|
|
|
)
|
|
|
|
|
2019-01-21 19:06:03 +01:00
|
|
|
self.assertEqual(
|
|
|
|
user_info(hamlet),
|
|
|
|
dict(away=True, status_text='on vacation'),
|
|
|
|
)
|
2018-12-17 22:04:07 +01:00
|
|
|
|
|
|
|
# Now revoke "away" status.
|
|
|
|
payload = dict(away=ujson.dumps(False))
|
|
|
|
|
|
|
|
event_info = EventInfo()
|
|
|
|
with capture_event(event_info):
|
|
|
|
result = self.client_post('/json/users/me/status', payload)
|
|
|
|
self.assert_json_success(result)
|
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
event_info.payload,
|
|
|
|
dict(type='user_status', user_id=hamlet.id, away=False),
|
|
|
|
)
|
|
|
|
|
|
|
|
away_user_ids = get_away_user_ids(realm_id=realm_id)
|
|
|
|
self.assertEqual(away_user_ids, set())
|
2019-01-21 19:06:03 +01:00
|
|
|
|
|
|
|
# And now just update your info.
|
|
|
|
# The server will trim the whitespace here.
|
|
|
|
payload = dict(status_text=' in office ')
|
|
|
|
|
|
|
|
event_info = EventInfo()
|
|
|
|
with capture_event(event_info):
|
|
|
|
result = self.client_post('/json/users/me/status', payload)
|
|
|
|
self.assert_json_success(result)
|
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
event_info.payload,
|
|
|
|
dict(type='user_status', user_id=hamlet.id, status_text='in office'),
|
|
|
|
)
|
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
user_info(hamlet),
|
|
|
|
dict(status_text='in office'),
|
|
|
|
)
|
|
|
|
|
|
|
|
# And finally clear your info.
|
|
|
|
payload = dict(status_text='')
|
|
|
|
|
|
|
|
event_info = EventInfo()
|
|
|
|
with capture_event(event_info):
|
|
|
|
result = self.client_post('/json/users/me/status', payload)
|
|
|
|
self.assert_json_success(result)
|
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
event_info.payload,
|
|
|
|
dict(type='user_status', user_id=hamlet.id, status_text=''),
|
|
|
|
)
|
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
get_user_info_dict(realm_id=realm_id),
|
|
|
|
{},
|
|
|
|
)
|