paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 17:07:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

invitations: Move spammer check from do_invite_users into its own function.

Browse Source
This commit is contained in:
Rishi Gupta
2017-12-04 22:59:27 -08:00
committed by Greg Price
parent e48bc9136a
commit cb527fd3c6
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
zerver/lib/actions.py
View File

@@ -3926,24 +3926,27 @@ class InvitationError(JsonableError):
self.errors = errors # type: List[Tuple[Text, str]] self.errors = errors # type: List[Tuple[Text, str]]
self.sent_invitations = sent_invitations # type: bool self.sent_invitations = sent_invitations # type: bool
def do_invite_users(user_profile: UserProfile, def check_invite_limit(user: UserProfile, num_invitees: int) -> None:
invitee_emails: SizedTextIterable,
streams: Iterable[Stream],
invite_as_admin: Optional[bool]=False,
body: Optional[str]=None) -> None:
if settings.OPEN_REALM_CREATION: if settings.OPEN_REALM_CREATION:
# Discourage using invitation emails as a vector for carrying spam # Discourage using invitation emails as a vector for carrying spam
sent_invites = Confirmation.objects.filter( sent_invites = Confirmation.objects.filter(
realm=user_profile.realm, realm=user.realm,
date_sent__gte=timezone_now() - datetime.timedelta(days=1), date_sent__gte=timezone_now() - datetime.timedelta(days=1),
type=Confirmation.INVITATION).count() type=Confirmation.INVITATION).count()
if len(invitee_emails) + sent_invites > user_profile.realm.max_invites: if num_invitees + sent_invites > user.realm.max_invites:
raise InvitationError( raise InvitationError(
_("You do not have enough remaining invites; " _("You do not have enough remaining invites; "
"try again with fewer emails, or contact %s. " "try again with fewer emails, or contact %s. "
"No invitations were sent." % (settings.ZULIP_ADMINISTRATOR)), "No invitations were sent." % (settings.ZULIP_ADMINISTRATOR)),
[], sent_invitations=False) [], sent_invitations=False)
def do_invite_users(user_profile: UserProfile,
invitee_emails: SizedTextIterable,
streams: Iterable[Stream],
invite_as_admin: Optional[bool]=False,
body: Optional[str]=None) -> None:
check_invite_limit(user_profile, len(invitee_emails))
validated_emails = [] # type: List[Text] validated_emails = [] # type: List[Text]
errors = [] # type: List[Tuple[Text, str]] errors = [] # type: List[Tuple[Text, str]]
skipped = [] # type: List[Tuple[Text, str]] skipped = [] # type: List[Tuple[Text, str]]