snapshot of https://github.com/mattermost/mattermost.git (master, 2026-09-16; blobs > 131072B omitted)
Some checks failed
Server CI / Postgres (shard 0) (push) Has been skipped
Server CI / Postgres (shard 3) (push) Has been skipped
BuildEnv Docker Image / build-image (push) Failing after 4s
BuildEnv Docker Image / build-image-fips (push) Failing after 4s
Migration Review & Release Notes / Generate migration review & release notes (push) Failing after 3s
Server CI / Build Environment (push) Failing after 3s
Server CI / Postgres (shard 1) (push) Has been skipped
Tools CI / check-style (mattermost-govet) (push) Failing after 4s
Server CI / Postgres (shard 2) (push) Has been skipped
Tools CI / check-style (mmgotool) (push) Failing after 3s
Server CI / Elasticsearch v8 Compatibility (push) Has been skipped
Server CI / OpenSearch v2 Compatibility (push) Has been skipped
Server CI / Postgres FIPS (shard 0) (push) Has been skipped
Tools CI / Test (mattermost-govet) (push) Failing after 3s
Server CI / Postgres FIPS (shard 1) (push) Has been skipped
Server CI / Postgres FIPS (shard 2) (push) Has been skipped
Tools CI / Test (mmgotool) (push) Failing after 3s
Server CI / Postgres FIPS (shard 3) (push) Has been skipped
Server CI / Run mmctl tests (push) Has been skipped
Server CI / Run mmctl tests (FIPS) (push) Has been skipped
Server CI / Merge Postgres Test Results (push) Has been skipped
Server CI / Merge Postgres FIPS Test Results (push) Has been skipped
Server CI / Check backport migrations (push) Has been skipped
Server CI / Check generated files (push) Has been skipped
Server CI / check-style (push) Has been skipped
Server CI / Vet API (push) Has been skipped
Server CI / Build mattermost server app (push) Has been skipped
Server CI / Server CI Complete (push) Failing after 2s
Server CI / Server CI Artifacts (push) Has been skipped
Server CI / Sentry Upload (push) Has been skipped
Server CI / Server CI Report (push) Failing after 5m1s
Server CI Nightly Race / Race Detector (push) Has been skipped
CodeQL / Analyze (go) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Webapp CI Cache Warm / Warm Webapp node_modules Cache (push) Has been cancelled
E2E CI Cache Warm / Warm E2E npm Registry Cache (push) Has been cancelled
API / build (push) Has been cancelled
Web App CI / check-types (push) Has been cancelled
Web App CI / check-lint (push) Has been cancelled
Web App CI / check-i18n (push) Has been cancelled
Web App CI / check-external-links (push) Has been cancelled
Web App CI / test (platform) (push) Has been cancelled
Web App CI / test (mattermost-redux) (push) Has been cancelled
Web App CI / test (channels shard 1/4) (push) Has been cancelled
Web App CI / test (channels shard 2/4) (push) Has been cancelled
Web App CI / test (channels shard 3/4) (push) Has been cancelled
Web App CI / test (channels shard 4/4) (push) Has been cancelled
Web App CI / upload-coverage (push) Has been cancelled
Web App CI / build (push) Has been cancelled
YAML Lint / yamllint (push) Has been cancelled
Push mirrored docker images / cd/Push mirrored docker images (push) Has been cancelled
docs-cd / Build and deploy docs (push) Has been cancelled
Docs CI / build (push) Has been cancelled
E2E Cache Warm: Cypress deps / Warm Cypress deps cache (push) Has been cancelled
Scorecards supply-chain security / Scorecard analysis (push) Has been cancelled
Server CI Weekly / Postgres FIPS (push) Has been skipped
Server CI Weekly / Run mmctl tests (FIPS) (push) Has been skipped
Server CI Weekly / Postgres with binary parameters (push) Has been skipped
Server CI Weekly / Build Environment (push) Failing after 1s
Server CI Cache Warm / Warm Go Module and Build Cache (push) Failing after 1s
Server CI Nightly Race / Build Environment (push) Failing after 1s
Some checks failed
Server CI / Postgres (shard 0) (push) Has been skipped
Server CI / Postgres (shard 3) (push) Has been skipped
BuildEnv Docker Image / build-image (push) Failing after 4s
BuildEnv Docker Image / build-image-fips (push) Failing after 4s
Migration Review & Release Notes / Generate migration review & release notes (push) Failing after 3s
Server CI / Build Environment (push) Failing after 3s
Server CI / Postgres (shard 1) (push) Has been skipped
Tools CI / check-style (mattermost-govet) (push) Failing after 4s
Server CI / Postgres (shard 2) (push) Has been skipped
Tools CI / check-style (mmgotool) (push) Failing after 3s
Server CI / Elasticsearch v8 Compatibility (push) Has been skipped
Server CI / OpenSearch v2 Compatibility (push) Has been skipped
Server CI / Postgres FIPS (shard 0) (push) Has been skipped
Tools CI / Test (mattermost-govet) (push) Failing after 3s
Server CI / Postgres FIPS (shard 1) (push) Has been skipped
Server CI / Postgres FIPS (shard 2) (push) Has been skipped
Tools CI / Test (mmgotool) (push) Failing after 3s
Server CI / Postgres FIPS (shard 3) (push) Has been skipped
Server CI / Run mmctl tests (push) Has been skipped
Server CI / Run mmctl tests (FIPS) (push) Has been skipped
Server CI / Merge Postgres Test Results (push) Has been skipped
Server CI / Merge Postgres FIPS Test Results (push) Has been skipped
Server CI / Check backport migrations (push) Has been skipped
Server CI / Check generated files (push) Has been skipped
Server CI / check-style (push) Has been skipped
Server CI / Vet API (push) Has been skipped
Server CI / Build mattermost server app (push) Has been skipped
Server CI / Server CI Complete (push) Failing after 2s
Server CI / Server CI Artifacts (push) Has been skipped
Server CI / Sentry Upload (push) Has been skipped
Server CI / Server CI Report (push) Failing after 5m1s
Server CI Nightly Race / Race Detector (push) Has been skipped
CodeQL / Analyze (go) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Webapp CI Cache Warm / Warm Webapp node_modules Cache (push) Has been cancelled
E2E CI Cache Warm / Warm E2E npm Registry Cache (push) Has been cancelled
API / build (push) Has been cancelled
Web App CI / check-types (push) Has been cancelled
Web App CI / check-lint (push) Has been cancelled
Web App CI / check-i18n (push) Has been cancelled
Web App CI / check-external-links (push) Has been cancelled
Web App CI / test (platform) (push) Has been cancelled
Web App CI / test (mattermost-redux) (push) Has been cancelled
Web App CI / test (channels shard 1/4) (push) Has been cancelled
Web App CI / test (channels shard 2/4) (push) Has been cancelled
Web App CI / test (channels shard 3/4) (push) Has been cancelled
Web App CI / test (channels shard 4/4) (push) Has been cancelled
Web App CI / upload-coverage (push) Has been cancelled
Web App CI / build (push) Has been cancelled
YAML Lint / yamllint (push) Has been cancelled
Push mirrored docker images / cd/Push mirrored docker images (push) Has been cancelled
docs-cd / Build and deploy docs (push) Has been cancelled
Docs CI / build (push) Has been cancelled
E2E Cache Warm: Cypress deps / Warm Cypress deps cache (push) Has been cancelled
Scorecards supply-chain security / Scorecard analysis (push) Has been cancelled
Server CI Weekly / Postgres FIPS (push) Has been skipped
Server CI Weekly / Run mmctl tests (FIPS) (push) Has been skipped
Server CI Weekly / Postgres with binary parameters (push) Has been skipped
Server CI Weekly / Build Environment (push) Failing after 1s
Server CI Cache Warm / Warm Go Module and Build Cache (push) Failing after 1s
Server CI Nightly Race / Build Environment (push) Failing after 1s
This commit is contained in:
252
server/channels/jobs/resend_invitation_email/worker.go
Normal file
252
server/channels/jobs/resend_invitation_email/worker.go
Normal file
@@ -0,0 +1,252 @@
|
||||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
package resend_invitation_email
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"os"
|
||||
"strconv"
|
||||
|
||||
"github.com/mattermost/mattermost/server/public/model"
|
||||
"github.com/mattermost/mattermost/server/public/shared/configservice"
|
||||
"github.com/mattermost/mattermost/server/public/shared/mlog"
|
||||
"github.com/mattermost/mattermost/server/public/shared/request"
|
||||
"github.com/mattermost/mattermost/server/v8/channels/jobs"
|
||||
"github.com/mattermost/mattermost/server/v8/channels/store"
|
||||
)
|
||||
|
||||
const FourtyEightHoursInMillis int64 = 172800000
|
||||
|
||||
type AppIface interface {
|
||||
configservice.ConfigService
|
||||
GetUserByEmail(email string) (*model.User, *model.AppError)
|
||||
GetTeamMembersByIds(teamID string, userIDs []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError)
|
||||
InviteNewUsersToTeamGracefully(rctx request.CTX, memberInvite *model.MemberInvite, teamID, senderId string, reminderInterval string) ([]*model.EmailInviteWithError, *model.AppError)
|
||||
}
|
||||
|
||||
type ResendInvitationEmailWorker struct {
|
||||
name string
|
||||
stop chan bool
|
||||
stopped chan bool
|
||||
jobs chan model.Job
|
||||
jobServer *jobs.JobServer
|
||||
logger mlog.LoggerIFace
|
||||
app AppIface
|
||||
store store.Store
|
||||
}
|
||||
|
||||
func MakeWorker(jobServer *jobs.JobServer, app AppIface, store store.Store) *ResendInvitationEmailWorker {
|
||||
const workerName = "ResendInvitationEmail"
|
||||
worker := ResendInvitationEmailWorker{
|
||||
name: workerName,
|
||||
stop: make(chan bool, 1),
|
||||
stopped: make(chan bool, 1),
|
||||
jobs: make(chan model.Job),
|
||||
jobServer: jobServer,
|
||||
logger: jobServer.Logger().With(mlog.String("worker_name", workerName)),
|
||||
app: app,
|
||||
store: store,
|
||||
}
|
||||
return &worker
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) Run() {
|
||||
rseworker.logger.Debug("Worker started")
|
||||
|
||||
defer func() {
|
||||
rseworker.logger.Debug("Worker finished")
|
||||
rseworker.stopped <- true
|
||||
}()
|
||||
|
||||
for {
|
||||
select {
|
||||
case <-rseworker.stop:
|
||||
rseworker.logger.Debug("Worker received stop signal")
|
||||
return
|
||||
case job := <-rseworker.jobs:
|
||||
rseworker.DoJob(&job)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) IsEnabled(cfg *model.Config) bool {
|
||||
return *cfg.ServiceSettings.EnableEmailInvitations
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) Stop() {
|
||||
rseworker.logger.Debug("Worker stopping")
|
||||
rseworker.stop <- true
|
||||
<-rseworker.stopped
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) JobChannel() chan<- model.Job {
|
||||
return rseworker.jobs
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) DoJob(job *model.Job) {
|
||||
logger := rseworker.logger.With(jobs.JobLoggerFields(job)...)
|
||||
logger.Debug("Worker: Received a new candidate job.")
|
||||
defer rseworker.jobServer.HandleJobPanic(logger, job)
|
||||
|
||||
elapsedTimeSinceSchedule, DurationInMillis := rseworker.GetDurations(job)
|
||||
if elapsedTimeSinceSchedule > DurationInMillis {
|
||||
if appErr := rseworker.ResendEmails(logger, job, "48"); appErr != nil {
|
||||
rseworker.setJobError(logger, job, appErr)
|
||||
return
|
||||
}
|
||||
rseworker.TearDown(logger, job)
|
||||
}
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) setJobSuccess(logger mlog.LoggerIFace, job *model.Job) {
|
||||
if err := rseworker.jobServer.SetJobSuccess(job); err != nil {
|
||||
logger.Error("Worker: Failed to set success for job", mlog.Err(err))
|
||||
rseworker.setJobError(logger, job, err)
|
||||
}
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) setJobError(logger mlog.LoggerIFace, job *model.Job, appError *model.AppError) {
|
||||
if err := rseworker.jobServer.SetJobError(job, appError); err != nil {
|
||||
logger.Error("Worker: Failed to set job error", mlog.Err(err))
|
||||
}
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) cleanEmailData(emailStringData string) ([]string, error) {
|
||||
// emailStringData looks like this ["user1@gmail.com","user2@gmail.com"]
|
||||
emails := []string{}
|
||||
err := json.Unmarshal([]byte(emailStringData), &emails)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return emails, nil
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) cleanChannelsData(channelStringData string) ([]string, error) {
|
||||
// channelStringData looks like this ["uuuiiiiidddd","uuuiiiiidddd"]
|
||||
channels := []string{}
|
||||
err := json.Unmarshal([]byte(channelStringData), &channels)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return channels, nil
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) removeAlreadyJoined(teamID string, emailList []string) []string {
|
||||
var notJoinedYet []string
|
||||
for _, email := range emailList {
|
||||
// check if the user with this email is on the system already
|
||||
user, appErr := rseworker.app.GetUserByEmail(email)
|
||||
if appErr != nil {
|
||||
notJoinedYet = append(notJoinedYet, email)
|
||||
continue
|
||||
}
|
||||
// now we check if they are part of the team already
|
||||
userID := []string{user.Id}
|
||||
members, appErr := rseworker.app.GetTeamMembersByIds(teamID, userID, nil)
|
||||
if len(members) == 0 || appErr != nil {
|
||||
notJoinedYet = append(notJoinedYet, email)
|
||||
}
|
||||
}
|
||||
|
||||
return notJoinedYet
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) GetDurations(job *model.Job) (int64, int64) {
|
||||
scheduledAt, _ := strconv.ParseInt(job.Data["scheduledAt"], 10, 64)
|
||||
now := model.GetMillis()
|
||||
|
||||
elapsedTimeSinceSchedule := now - scheduledAt
|
||||
|
||||
duration := os.Getenv("MM_RESEND_INVITATION_EMAIL_JOB_DURATION")
|
||||
DurationInMillis, parseError := strconv.ParseInt(duration, 10, 64)
|
||||
if parseError != nil {
|
||||
// default to 48 hours
|
||||
DurationInMillis = FourtyEightHoursInMillis
|
||||
}
|
||||
|
||||
return elapsedTimeSinceSchedule, DurationInMillis
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) TearDown(logger mlog.LoggerIFace, job *model.Job) {
|
||||
if _, err := rseworker.store.System().PermanentDeleteByName(job.Id); err != nil {
|
||||
logger.Error("Worker: Failed to tear down data", mlog.Err(err))
|
||||
}
|
||||
|
||||
rseworker.setJobSuccess(logger, job)
|
||||
}
|
||||
|
||||
func (rseworker *ResendInvitationEmailWorker) ResendEmails(logger mlog.LoggerIFace, job *model.Job, interval string) *model.AppError {
|
||||
rctx := request.EmptyContext(logger)
|
||||
|
||||
teamID := job.Data["teamID"]
|
||||
emailListData := job.Data["emailList"]
|
||||
|
||||
emailList, err := rseworker.cleanEmailData(emailListData)
|
||||
if err != nil {
|
||||
appErr := model.NewAppError("worker: "+rseworker.name, "job_id: "+job.Id, nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
logger.Error("Worker: Failed to clean emails string data", mlog.Err(appErr))
|
||||
return appErr
|
||||
}
|
||||
|
||||
var channelList []string
|
||||
if channelListData := job.Data["channelList"]; channelListData != "" {
|
||||
channelList, err = rseworker.cleanChannelsData(channelListData)
|
||||
if err != nil {
|
||||
appErr := model.NewAppError("worker: "+rseworker.name, "job_id: "+job.Id, nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
logger.Error("Worker: Failed to clean channel string data", mlog.Err(appErr))
|
||||
return appErr
|
||||
}
|
||||
}
|
||||
|
||||
emailList = rseworker.removeAlreadyJoined(teamID, emailList)
|
||||
if len(emailList) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
memberInvite := model.MemberInvite{
|
||||
Emails: emailList,
|
||||
}
|
||||
|
||||
if len(channelList) > 0 {
|
||||
memberInvite.ChannelIds = channelList
|
||||
}
|
||||
|
||||
if profileListData := job.Data["profilesList"]; profileListData != "" {
|
||||
var profiles []*model.MemberInviteProfile
|
||||
if err := json.Unmarshal([]byte(profileListData), &profiles); err != nil {
|
||||
appErr := model.NewAppError("worker: "+rseworker.name, "job_id: "+job.Id, nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
logger.Error("Worker: Failed to clean profiles string data", mlog.Err(appErr))
|
||||
return appErr
|
||||
}
|
||||
|
||||
remainingEmails := make(map[string]struct{}, len(emailList))
|
||||
for _, email := range emailList {
|
||||
remainingEmails[model.NormalizeEmail(email)] = struct{}{}
|
||||
}
|
||||
for _, profile := range profiles {
|
||||
if profile == nil {
|
||||
memberInvite.Profiles = append(memberInvite.Profiles, profile)
|
||||
continue
|
||||
}
|
||||
if _, ok := remainingEmails[model.NormalizeEmail(profile.Email)]; ok {
|
||||
memberInvite.Profiles = append(memberInvite.Profiles, profile)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
invitesWithErrors, appErr := rseworker.app.InviteNewUsersToTeamGracefully(rctx, &memberInvite, teamID, job.Data["senderID"], interval)
|
||||
if appErr != nil {
|
||||
logger.Error("Worker: Failed to send emails", mlog.Err(appErr))
|
||||
return appErr
|
||||
}
|
||||
for _, invite := range invitesWithErrors {
|
||||
if invite != nil && invite.Error != nil {
|
||||
logger.Error("Worker: Failed to resend invitation", mlog.String("email", invite.Email), mlog.Err(invite.Error))
|
||||
return invite.Error
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
95
server/channels/jobs/resend_invitation_email/worker_test.go
Normal file
95
server/channels/jobs/resend_invitation_email/worker_test.go
Normal file
@@ -0,0 +1,95 @@
|
||||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
|
||||
package resend_invitation_email
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/mattermost/mattermost/server/public/model"
|
||||
"github.com/mattermost/mattermost/server/public/shared/mlog"
|
||||
"github.com/mattermost/mattermost/server/public/shared/request"
|
||||
)
|
||||
|
||||
type fakeResendApp struct {
|
||||
invitedWith *model.MemberInvite
|
||||
joinedEmail string
|
||||
}
|
||||
|
||||
func (a *fakeResendApp) Config() *model.Config { return &model.Config{} }
|
||||
func (a *fakeResendApp) AddConfigListener(func(old, cur *model.Config)) string { return "" }
|
||||
func (a *fakeResendApp) RemoveConfigListener(string) {}
|
||||
func (a *fakeResendApp) GetUserByEmail(email string) (*model.User, *model.AppError) {
|
||||
if email == a.joinedEmail {
|
||||
return &model.User{Id: email}, nil
|
||||
}
|
||||
return nil, model.NewAppError("GetUserByEmail", "app.user.missing_account.const", nil, "", http.StatusNotFound)
|
||||
}
|
||||
func (a *fakeResendApp) GetTeamMembersByIds(teamID string, userIDs []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) {
|
||||
if len(userIDs) == 1 && userIDs[0] == a.joinedEmail {
|
||||
return []*model.TeamMember{{UserId: a.joinedEmail}}, nil
|
||||
}
|
||||
return nil, nil
|
||||
}
|
||||
func (a *fakeResendApp) InviteNewUsersToTeamGracefully(rctx request.CTX, memberInvite *model.MemberInvite, teamID, senderID, reminderInterval string) ([]*model.EmailInviteWithError, *model.AppError) {
|
||||
a.invitedWith = memberInvite
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func newTestWorker(t *testing.T, app AppIface) *ResendInvitationEmailWorker {
|
||||
t.Helper()
|
||||
return &ResendInvitationEmailWorker{
|
||||
name: "ResendInvitationEmail",
|
||||
logger: mlog.CreateConsoleTestLogger(t),
|
||||
app: app,
|
||||
}
|
||||
}
|
||||
|
||||
func TestResendEmailsCarriesProfilesForPendingUsers(t *testing.T) {
|
||||
profiles := []*model.MemberInviteProfile{
|
||||
{Email: "joined@example.com", Username: "joined.user"},
|
||||
{Email: "waiting@example.com", Username: "waiting.user", FirstName: "Waiting", LastName: "User"},
|
||||
}
|
||||
profilesJSON, err := json.Marshal(profiles)
|
||||
require.NoError(t, err)
|
||||
|
||||
app := &fakeResendApp{joinedEmail: "joined@example.com"}
|
||||
worker := newTestWorker(t, app)
|
||||
appErr := worker.ResendEmails(worker.logger, &model.Job{
|
||||
Id: model.NewId(),
|
||||
Data: map[string]string{
|
||||
"emailList": model.ArrayToJSON([]string{"joined@example.com", "waiting@example.com"}),
|
||||
"teamID": model.NewId(),
|
||||
"senderID": model.NewId(),
|
||||
"profilesList": string(profilesJSON),
|
||||
},
|
||||
}, "48")
|
||||
|
||||
require.Nil(t, appErr)
|
||||
require.Equal(t, []string{"waiting@example.com"}, app.invitedWith.Emails)
|
||||
require.Equal(t, profiles[1:], app.invitedWith.Profiles)
|
||||
}
|
||||
|
||||
func TestResendEmailsRejectsMalformedJobData(t *testing.T) {
|
||||
for _, key := range []string{"emailList", "channelList", "profilesList"} {
|
||||
t.Run(key, func(t *testing.T) {
|
||||
app := &fakeResendApp{}
|
||||
worker := newTestWorker(t, app)
|
||||
data := map[string]string{
|
||||
"emailList": model.ArrayToJSON([]string{"user@example.com"}),
|
||||
"teamID": model.NewId(),
|
||||
"senderID": model.NewId(),
|
||||
key: "not-json",
|
||||
}
|
||||
|
||||
appErr := worker.ResendEmails(worker.logger, &model.Job{Id: model.NewId(), Data: data}, "48")
|
||||
|
||||
require.NotNil(t, appErr)
|
||||
require.Nil(t, app.invitedWith)
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user