From 225867ac4a3bbae95e7e2ea720e0a7ed926802a5 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Fri, 3 Dec 2021 08:10:56 +0100 Subject: [PATCH] 105.6 - Alpha (105206) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/c/a/b/a.java | 71 +- .../api/directory/DirectoryEntryEvent.java | 67 + ...oryEntry.java => DirectoryEntryGuild.java} | 17 +- .../api/directory/DirectoryEntryType.java | 16 + .../java/com/discord/api/guild/Guild.java | 119 +- .../com/discord/api/guild/GuildHubType.java | 17 + .../api/guild/GuildHubTypeTypeAdapter.java | 36 + app/src/main/java/com/discord/app/App.java | 27 +- ...ser$parseGuildHubTypesFeatureFilter$1.java | 74 + ...uildExperimentFilter$Parser$parsers$5.java | 18 + .../dto/GuildExperimentFilter.java | 73 +- .../java/com/discord/models/guild/Guild.java | 185 +- .../com/discord/restapi/RestAPIInterface.java | 16 +- .../com/discord/stores/ReadyPayloadUtils.java | 40 +- .../com/discord/stores/StoreAnalytics.java | 2 +- .../stores/StoreApplicationStreaming.java | 8 +- .../StoreChannels$handleGuildRemove$2.java | 2 +- .../com/discord/stores/StoreChannels.java | 32 +- .../discord/stores/StoreChannelsSelected.java | 6 +- .../discord/stores/StoreClientDataState.java | 8 +- .../StoreCollapsedChannelCategories.java | 8 +- ...oreDirectories$addServerToDirectory$1.java | 24 +- ...special$$inlined$sortedByDescending$1.java | 9 +- ...ectories$fetchDirectoriesForChannel$1.java | 10 +- ...ectories$fetchDirectoriesForChannel$2.java | 10 +- ...fetchGuildScheduledEventsForChannel$1.java | 56 + ...StoreDirectories$observeDirectories$1.java | 8 +- ...tories$observeDirectoriesForChannel$1.java | 8 +- ...bserveDirectoryGuildScheduledEvents$1.java | 25 + ...rectories$removeServerFromDirectory$1.java | 6 +- ...rectories$removeServerFromDirectory$2.java | 14 +- .../com/discord/stores/StoreDirectories.java | 50 +- .../stores/StoreEmbeddedActivities.java | 2 +- .../com/discord/stores/StoreEmojiCustom.java | 24 +- .../com/discord/stores/StoreGameParty.java | 6 +- .../stores/StoreGatewayConnection.java | 10 +- ...GuildJoinRequest$fetchPendingGuilds$1.java | 2 +- .../stores/StoreGuildMemberCounts.java | 4 +- ...eGuildSelected$handleConnectionOpen$1.java | 2 +- .../discord/stores/StoreGuildSelected.java | 2 +- .../discord/stores/StoreGuildStickers.java | 16 +- .../java/com/discord/stores/StoreGuilds.java | 50 +- ...stantInvites$fetchInviteIfNotLoaded$1.java | 2 +- ...StoreInstantInvites$onInviteRemoved$1.java | 2 +- .../discord/stores/StoreInstantInvites.java | 2 +- .../java/com/discord/stores/StoreLurking.java | 14 +- .../com/discord/stores/StoreMentions.java | 18 +- .../com/discord/stores/StoreMessageAck.java | 6 +- .../stores/StoreMessagesMostRecent.java | 12 +- .../com/discord/stores/StorePermissions.java | 8 +- .../discord/stores/StoreReviewRequest.java | 2 +- .../discord/stores/StoreRtcConnection.java | 4 +- .../discord/stores/StoreStageChannels.java | 4 +- .../discord/stores/StoreStageInstances.java | 8 +- .../java/com/discord/stores/StoreStream.java | 20 +- .../stores/StoreStreamRtcConnection.java | 5 +- .../discord/stores/StoreThreadMessages.java | 6 +- .../discord/stores/StoreThreadsActive.java | 6 +- .../stores/StoreThreadsActiveJoined.java | 2 +- .../discord/stores/StoreThreadsJoined.java | 10 +- .../java/com/discord/stores/StoreUser.java | 12 +- .../com/discord/stores/StoreUserPresence.java | 10 +- .../com/discord/stores/StoreVoiceStates.java | 20 +- .../utilities/analytics/AnalyticsTracker.java | 8 +- .../DirectoryUtils$showServerOptions$2.java | 8 +- .../utilities/directories/DirectoryUtils.java | 8 +- .../directories/DirectoryUtilsKt.java | 8 +- .../experiments/ExperimentUtils.java | 112 +- .../features/GrowthTeamFeatures.java | 4 + .../utilities/guilds/GuildUtilsKt.java | 2 +- .../guilds/MemberVerificationUtils.java | 2 +- .../com/discord/utilities/icon/IconUtils.java | 2 +- .../com/discord/utilities/rest/RestAPI.java | 21 +- ...bineLatestOverloadsKt$combineLatest$8.java | 22 +- .../ObservableCombineLatestOverloadsKt.java | 13 +- .../widgets/auth/AuthInviteInfoView.java | 2 +- ...mpanion$getSelectedGuildChannelList$1.java | 22 +- ...ListBuilder$$inlined$forEach$lambda$1.java | 4 +- ...ListBuilder$$inlined$forEach$lambda$2.java | 4 +- ...ListBuilder$$inlined$forEach$lambda$3.java | 4 +- ...ListBuilder$$inlined$forEach$lambda$4.java | 4 +- ...ListBuilder$$inlined$forEach$lambda$5.java | 4 +- ...ListBuilder$$inlined$forEach$lambda$6.java | 4 +- ...ListBuilder$$inlined$forEach$lambda$7.java | 4 +- ...ListBuilder$$inlined$forEach$lambda$8.java | 4 +- .../channels/list/WidgetChannelListModel.java | 14 +- .../WidgetChannelsList$onViewBound$8.java | 26 +- ...temGuildScheduledEvents$onConfigure$1.java | 2 +- ...tAdapter$onViewGuildScheduledEvents$1.java | 11 +- .../list/WidgetChannelsListAdapter.java | 9 +- .../ChannelListItemGuildScheduledEvents.java | 44 +- .../widgets/chat/list/WidgetChatList.java | 5 +- ...ollToWithHighlight$animateHighlight$1.java | 2 +- ...ScrollToWithHighlight$scheduleRetry$1.java | 2 +- .../WidgetChatListAdapter$setHandlers$1.java | 17 +- .../list/adapter/WidgetChatListAdapter.java | 19 +- ...EventInvite$Model$Companion$observe$1.java | 2 +- ...emInvite$ModelProvider$observeModel$1.java | 2 +- .../WidgetChatListAdapterItemInvite.java | 44 +- ...tAdapterItemStageInvite$configureUI$2.java | 2 +- .../WidgetChatListAdapterItemStageInvite.java | 20 +- .../DirectoryChannelItemClickInterface.java | 4 +- .../directories/DirectoryEntryData.java | 30 +- ...ewHolder$bind$$inlined$apply$lambda$1.java | 8 +- ...ewHolder$bind$$inlined$apply$lambda$2.java | 8 +- ...ewHolder$bind$$inlined$apply$lambda$3.java | 12 +- .../directories/DirectoryEntryViewHolder.java | 4 +- ...sSearch$adapter$1$onOverflowClicked$1.java | 8 +- .../WidgetDirectoriesSearch$adapter$1.java | 8 +- ...wModel$ViewState$directoryEntryData$2.java | 8 +- ...earchViewModel$searchForDirectories$1.java | 12 +- .../WidgetDirectoriesSearchViewModel.java | 24 +- ...esViewModel$Companion$observeStores$1.java | 4 +- ...del$ViewState$allDirectoryEntryData$2.java | 8 +- ...wModel$ViewState$directoryEntryData$2.java | 10 +- .../WidgetDirectoriesViewModel.java | 16 +- ...ategory$adapter$1$onOverflowClicked$1.java | 8 +- .../WidgetDirectoryCategory$adapter$1.java | 8 +- .../directories/WidgetDirectoryChannel.java | 4 +- .../guilds/create/WidgetGuildClone.java | 10 +- .../widgets/guilds/invite/GuildInvite.java | 2 +- .../InviteJoinHelper$joinViaInvite$4.java | 12 +- .../guilds/invite/InviteJoinHelper.java | 2 +- ...WidgetGuildInvite$configureLoadedUI$2.java | 2 +- .../guilds/invite/WidgetGuildInviteShare.java | 4 +- .../invite/WidgetGuildInviteShareCompact.java | 4 +- .../guilds/invite/WidgetInviteInfo.java | 10 +- .../widgets/hubs/HubAddServerState.java | 14 +- .../widgets/hubs/HubDescriptionState.java | 14 +- ...ener$1$$special$$inlined$let$lambda$1.java | 8 +- ...tHubAddServer$onServerClickListener$1.java | 10 +- ...erViewModel$Companion$observeStores$1.java | 12 +- ...WidgetHubAuthentication$configureUi$1.java | 2 +- .../WidgetHubDescription$configureUI$3.java | 10 +- ...etHubDescriptionViewModel$addServer$1.java | 6 +- ...etHubDescriptionViewModel$addServer$2.java | 10 +- .../widgets/hubs/events/HubEventsArgs.java | 77 + ...ubEventsPage$$special$$inlined$args$1.java | 39 + .../hubs/events/WidgetHubEventsPage.java | 28 + ...tsViewModel$Companion$getStoreState$1.java | 20 +- .../MobileReportsViewModel.java | 60 +- ...tServerSettingsOverview$configureUI$7.java | 2 +- ...nableCommunityViewModel$updateGuild$2.java | 2 +- .../widgets/settings/WidgetSettings.java | 2 +- .../ViewHolderStageChannelRichPresence.java | 2 +- app/src/main/java/d0/e0/p/d/c.java | 8 +- app/src/main/java/d0/e0/p/d/j.java | 6 +- app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java | 4 +- app/src/main/java/d0/z/c/c.java | 2 +- app/src/main/java/d0/z/d/e0.java | 6 +- app/src/main/java/d0/z/d/f.java | 4 +- .../{Function19.java => Function20.java} | 4 +- .../drawable-xxxhdpi/img_age_gate_failure.png | Bin 59828 -> 59828 bytes .../main/res/drawable/hub_events_header.png | Bin 0 -> 13220 bytes .../res/layout/widget_hub_events_header.xml | 10 +- .../res/layout/widget_hub_events_page.xml | 2 +- app/src/main/res/values-ar-rXB/strings.xml | 17 +- app/src/main/res/values-bg/strings.xml | 6 - app/src/main/res/values-cs/strings.xml | 6 - app/src/main/res/values-da/strings.xml | 6 - app/src/main/res/values-de/strings.xml | 6 - app/src/main/res/values-el/strings.xml | 6 - app/src/main/res/values-en-rXA/strings.xml | 17 +- app/src/main/res/values-es-rES/strings.xml | 6 - app/src/main/res/values-fi/strings.xml | 6 - app/src/main/res/values-fr/strings.xml | 10 +- app/src/main/res/values-hi/strings.xml | 6 - app/src/main/res/values-hr/strings.xml | 6 - app/src/main/res/values-hu/strings.xml | 6 - app/src/main/res/values-it/strings.xml | 8 +- app/src/main/res/values-ja/strings.xml | 6 - app/src/main/res/values-ko/strings.xml | 10 +- app/src/main/res/values-lt/strings.xml | 6 - app/src/main/res/values-nl/strings.xml | 6 - app/src/main/res/values-no/strings.xml | 6 - app/src/main/res/values-pl/strings.xml | 6 - app/src/main/res/values-pt-rBR/strings.xml | 6 - app/src/main/res/values-ro/strings.xml | 6 - app/src/main/res/values-ru/strings.xml | 6 - app/src/main/res/values-sv-rSE/strings.xml | 6 - app/src/main/res/values-th/strings.xml | 6 - app/src/main/res/values-tr/strings.xml | 6 - app/src/main/res/values-uk/strings.xml | 6 - app/src/main/res/values-vi/strings.xml | 6 - app/src/main/res/values-zh-rCN/strings.xml | 6 - app/src/main/res/values-zh-rTW/strings.xml | 6 - app/src/main/res/values/public.xml | 12822 ++++++++-------- app/src/main/res/values/strings.xml | 19 +- 190 files changed, 8039 insertions(+), 7454 deletions(-) create mode 100644 app/src/main/java/com/discord/api/directory/DirectoryEntryEvent.java rename app/src/main/java/com/discord/api/directory/{DirectoryEntry.java => DirectoryEntryGuild.java} (70%) create mode 100644 app/src/main/java/com/discord/api/directory/DirectoryEntryType.java create mode 100644 app/src/main/java/com/discord/api/guild/GuildHubType.java create mode 100644 app/src/main/java/com/discord/api/guild/GuildHubTypeTypeAdapter.java create mode 100644 app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1.java create mode 100644 app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter$Parser$parsers$5.java create mode 100644 app/src/main/java/com/discord/stores/StoreDirectories$fetchGuildScheduledEventsForChannel$1.java create mode 100644 app/src/main/java/com/discord/stores/StoreDirectories$observeDirectoryGuildScheduledEvents$1.java create mode 100644 app/src/main/java/com/discord/widgets/hubs/events/HubEventsArgs.java create mode 100644 app/src/main/java/com/discord/widgets/hubs/events/WidgetHubEventsPage$$special$$inlined$args$1.java rename app/src/main/java/kotlin/jvm/functions/{Function19.java => Function20.java} (52%) create mode 100644 app/src/main/res/drawable/hub_events_header.png diff --git a/app/build.gradle b/app/build.gradle index 94d905bf99..534b9d39db 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 105205 - versionName "105.5 - Alpha" + versionCode 105206 + versionName "105.6 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5d8277840e..9d8f634717 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/c/a/b/a.java b/app/src/main/java/c/a/b/a.java index 6f91754e10..3372537d8d 100644 --- a/app/src/main/java/c/a/b/a.java +++ b/app/src/main/java/c/a/b/a.java @@ -24,6 +24,8 @@ import com.discord.api.friendsuggestions.FriendSuggestionReasonType; import com.discord.api.friendsuggestions.FriendSuggestionReasonTypeAdapter; import com.discord.api.guild.GuildExplicitContentFilter; import com.discord.api.guild.GuildExplicitContentFilterTypeAdapter; +import com.discord.api.guild.GuildHubType; +import com.discord.api.guild.GuildHubTypeTypeAdapter; import com.discord.api.guild.GuildMaxVideoChannelUsers; import com.discord.api.guild.GuildMaxVideoChannelUsersTypeAdapter; import com.discord.api.guild.GuildVerificationLevel; @@ -76,7 +78,7 @@ import java.util.Map; import kotlin.jvm.functions.Function0; /* compiled from: TypeAdapterRegistrar.kt */ public final class a { - public static final Map, Function0> a = h0.mapOf(o.to(ActivityPlatform.class, b.j), o.to(ActivityType.class, C0023a.D), o.to(ApplicationStatus.class, C0023a.I), o.to(UtcDateTime.class, C0023a.J), o.to(NsfwAllowance.class, C0023a.K), o.to(PremiumTier.class, C0023a.L), o.to(ActivityType.class, C0023a.M), o.to(Phone.class, C0023a.N), o.to(ApplicationCommandType.class, C0023a.O), o.to(OAuthScope.class, C0023a.j), o.to(GuildVerificationLevel.class, C0023a.k), o.to(GuildExplicitContentFilter.class, C0023a.l), o.to(GuildMaxVideoChannelUsers.class, C0023a.m), o.to(ComponentType.class, C0023a.n), o.to(ButtonStyle.class, C0023a.o), o.to(ReportNodeChild.class, C0023a.p), o.to(ReportNodeElementData.class, C0023a.q), o.to(ReportNodeBottomButton.class, C0023a.r), o.to(ApplicationCommandPermissionType.class, C0023a.f41s), o.to(StageInstancePrivacyLevel.class, C0023a.t), o.to(FriendSuggestionReasonType.class, C0023a.u), o.to(AllowedInSuggestionsType.class, C0023a.v), o.to(StickerFormatType.class, C0023a.w), o.to(LocalizedString.class, C0023a.f42x), o.to(MessageActivityType.class, C0023a.f43y), o.to(EmbedType.class, C0023a.f44z), o.to(StickerType.class, C0023a.A), o.to(GuildScheduledEventStatus.class, C0023a.B), o.to(GuildScheduledEventEntityType.class, C0023a.C), o.to(Science.Event.SchemaObject.class, C0023a.E), o.to(GuildRoleSubscriptionBenefitType.class, C0023a.F), o.to(PriceTierType.class, C0023a.G), o.to(ApplicationType.class, C0023a.H)); + public static final Map, Function0> a = h0.mapOf(o.to(ActivityPlatform.class, b.j), o.to(ActivityType.class, C0023a.D), o.to(ApplicationStatus.class, C0023a.J), o.to(UtcDateTime.class, C0023a.K), o.to(NsfwAllowance.class, C0023a.L), o.to(PremiumTier.class, C0023a.M), o.to(ActivityType.class, C0023a.N), o.to(Phone.class, C0023a.O), o.to(ApplicationCommandType.class, C0023a.P), o.to(OAuthScope.class, C0023a.j), o.to(GuildHubType.class, C0023a.k), o.to(GuildVerificationLevel.class, C0023a.l), o.to(GuildExplicitContentFilter.class, C0023a.m), o.to(GuildMaxVideoChannelUsers.class, C0023a.n), o.to(ComponentType.class, C0023a.o), o.to(ButtonStyle.class, C0023a.p), o.to(ReportNodeChild.class, C0023a.q), o.to(ReportNodeElementData.class, C0023a.r), o.to(ReportNodeBottomButton.class, C0023a.f41s), o.to(ApplicationCommandPermissionType.class, C0023a.t), o.to(StageInstancePrivacyLevel.class, C0023a.u), o.to(FriendSuggestionReasonType.class, C0023a.v), o.to(AllowedInSuggestionsType.class, C0023a.w), o.to(StickerFormatType.class, C0023a.f42x), o.to(LocalizedString.class, C0023a.f43y), o.to(MessageActivityType.class, C0023a.f44z), o.to(EmbedType.class, C0023a.A), o.to(StickerType.class, C0023a.B), o.to(GuildScheduledEventStatus.class, C0023a.C), o.to(GuildScheduledEventEntityType.class, C0023a.E), o.to(Science.Event.SchemaObject.class, C0023a.F), o.to(GuildRoleSubscriptionBenefitType.class, C0023a.G), o.to(PriceTierType.class, C0023a.H), o.to(ApplicationType.class, C0023a.I)); public static final List b = n.listOf((Object[]) new c.i.d.o[]{ComponentRuntimeTypeAdapter.INSTANCE.a(), new NullSerializableTypeAdapterFactory()}); /* compiled from: kotlin-style lambda group */ @@ -97,6 +99,7 @@ public final class a { public static final C0023a M = new C0023a(29); public static final C0023a N = new C0023a(30); public static final C0023a O = new C0023a(31); + public static final C0023a P = new C0023a(32); public static final C0023a j = new C0023a(0); public static final C0023a k = new C0023a(1); public static final C0023a l = new C0023a(2); @@ -122,81 +125,83 @@ public final class a { /* renamed from: z reason: collision with root package name */ public static final C0023a f44z = new C0023a(16); - public final /* synthetic */ int P; + public final /* synthetic */ int Q; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public C0023a(int i) { super(0); - this.P = i; + this.Q = i; } @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Object mo1invoke() { - switch (this.P) { + switch (this.Q) { case 0: return new OAuthScopeTypeAdapter(); case 1: - return new GuildVerificationLevelTypeAdapter(); + return new GuildHubTypeTypeAdapter(); case 2: - return new GuildExplicitContentFilterTypeAdapter(); + return new GuildVerificationLevelTypeAdapter(); case 3: - return new GuildMaxVideoChannelUsersTypeAdapter(); + return new GuildExplicitContentFilterTypeAdapter(); case 4: - return new ComponentTypeTypeAdapter(); + return new GuildMaxVideoChannelUsersTypeAdapter(); case 5: - return new ButtonStyleTypeAdapter(); + return new ComponentTypeTypeAdapter(); case 6: - return new ReportNodeChildTypeAdapter(); + return new ButtonStyleTypeAdapter(); case 7: - return new ReportNodeElementDataTypeAdapter(); + return new ReportNodeChildTypeAdapter(); case 8: - return new ReportNodeBottomButtonTypeAdapter(); + return new ReportNodeElementDataTypeAdapter(); case 9: - return new ApplicationCommandPermissionTypeTypeAdapter(); + return new ReportNodeBottomButtonTypeAdapter(); case 10: - return new StageInstancePrivacyLevelTypeAdapter(); + return new ApplicationCommandPermissionTypeTypeAdapter(); case 11: - return new FriendSuggestionReasonTypeAdapter(); + return new StageInstancePrivacyLevelTypeAdapter(); case 12: - return new AllowedInSuggestionsTypeAdapter(); + return new FriendSuggestionReasonTypeAdapter(); case 13: - return new StickerFormatTypeTypeAdapter(); + return new AllowedInSuggestionsTypeAdapter(); case 14: - return new LocalizedStringTypeAdapter(); + return new StickerFormatTypeTypeAdapter(); case 15: - return new MessageActivityTypeTypeAdapter(); + return new LocalizedStringTypeAdapter(); case 16: - return new EmbedTypeTypeAdapter(); + return new MessageActivityTypeTypeAdapter(); case 17: - return new StickerTypeTypeAdapter(); + return new EmbedTypeTypeAdapter(); case 18: - return new GuildScheduledEventStatusTypeAdapter(); + return new StickerTypeTypeAdapter(); case 19: - return new GuildScheduledEventEntityTypeTypeAdapter(); + return new GuildScheduledEventStatusTypeAdapter(); case 20: return new ActivityTypeTypeAdapter(); case 21: - return new AnalyticsSchemaTypeAdapter(); + return new GuildScheduledEventEntityTypeTypeAdapter(); case 22: - return new GuildRoleSubscriptionBenefitTypeAdapter(); + return new AnalyticsSchemaTypeAdapter(); case 23: - return new PriceTierTypeAdapter(); + return new GuildRoleSubscriptionBenefitTypeAdapter(); case 24: - return new ApplicationTypeAdapter(); + return new PriceTierTypeAdapter(); case 25: - return new ApplicationStatusTypeAdapter(); + return new ApplicationTypeAdapter(); case 26: - return new UtcDateTimeTypeAdapter(); + return new ApplicationStatusTypeAdapter(); case 27: - return new NsfwAllowanceTypeAdapter(); + return new UtcDateTimeTypeAdapter(); case 28: - return new PremiumTierTypeAdapter(); + return new NsfwAllowanceTypeAdapter(); case 29: - return new ActivityTypeTypeAdapter(); + return new PremiumTierTypeAdapter(); case 30: - return new PhoneTypeAdapter(); + return new ActivityTypeTypeAdapter(); case 31: + return new PhoneTypeAdapter(); + case 32: return new CommandTypeAdapter(); default: throw null; diff --git a/app/src/main/java/com/discord/api/directory/DirectoryEntryEvent.java b/app/src/main/java/com/discord/api/directory/DirectoryEntryEvent.java new file mode 100644 index 0000000000..3c5bf12328 --- /dev/null +++ b/app/src/main/java/com/discord/api/directory/DirectoryEntryEvent.java @@ -0,0 +1,67 @@ +package com.discord.api.directory; + +import c.d.b.a.a; +import com.discord.api.guildscheduledevent.GuildScheduledEvent; +import com.discord.api.utcdatetime.UtcDateTime; +import d0.z.d.m; +/* compiled from: DirectoryEntryGuild.kt */ +public final class DirectoryEntryEvent { + private final long authorId; + private final UtcDateTime createdAt; + private final String description; + private final long directoryChannelId; + private final long entityId; + private final GuildScheduledEvent guildScheduledEvent; + private final int primaryCategoryId; + + public final GuildScheduledEvent a() { + return this.guildScheduledEvent; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof DirectoryEntryEvent)) { + return false; + } + DirectoryEntryEvent directoryEntryEvent = (DirectoryEntryEvent) obj; + return this.directoryChannelId == directoryEntryEvent.directoryChannelId && this.entityId == directoryEntryEvent.entityId && this.authorId == directoryEntryEvent.authorId && m.areEqual(this.description, directoryEntryEvent.description) && this.primaryCategoryId == directoryEntryEvent.primaryCategoryId && m.areEqual(this.createdAt, directoryEntryEvent.createdAt) && m.areEqual(this.guildScheduledEvent, directoryEntryEvent.guildScheduledEvent); + } + + public int hashCode() { + long j = this.directoryChannelId; + long j2 = this.entityId; + long j3 = this.authorId; + int i = ((((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + ((int) (j3 ^ (j3 >>> 32)))) * 31; + String str = this.description; + int i2 = 0; + int hashCode = (((i + (str != null ? str.hashCode() : 0)) * 31) + this.primaryCategoryId) * 31; + UtcDateTime utcDateTime = this.createdAt; + int hashCode2 = (hashCode + (utcDateTime != null ? utcDateTime.hashCode() : 0)) * 31; + GuildScheduledEvent guildScheduledEvent = this.guildScheduledEvent; + if (guildScheduledEvent != null) { + i2 = guildScheduledEvent.hashCode(); + } + return hashCode2 + i2; + } + + public String toString() { + StringBuilder R = a.R("DirectoryEntryEvent(directoryChannelId="); + R.append(this.directoryChannelId); + R.append(", entityId="); + R.append(this.entityId); + R.append(", authorId="); + R.append(this.authorId); + R.append(", description="); + R.append(this.description); + R.append(", primaryCategoryId="); + R.append(this.primaryCategoryId); + R.append(", createdAt="); + R.append(this.createdAt); + R.append(", guildScheduledEvent="); + R.append(this.guildScheduledEvent); + R.append(")"); + return R.toString(); + } +} diff --git a/app/src/main/java/com/discord/api/directory/DirectoryEntry.java b/app/src/main/java/com/discord/api/directory/DirectoryEntryGuild.java similarity index 70% rename from app/src/main/java/com/discord/api/directory/DirectoryEntry.java rename to app/src/main/java/com/discord/api/directory/DirectoryEntryGuild.java index 7173794770..9d1651f60d 100644 --- a/app/src/main/java/com/discord/api/directory/DirectoryEntry.java +++ b/app/src/main/java/com/discord/api/directory/DirectoryEntryGuild.java @@ -4,8 +4,8 @@ import c.d.b.a.a; import com.discord.api.guild.preview.GuildPreview; import com.discord.api.utcdatetime.UtcDateTime; import d0.z.d.m; -/* compiled from: DirectoryEntry.kt */ -public final class DirectoryEntry { +/* compiled from: DirectoryEntryGuild.kt */ +public final class DirectoryEntryGuild { private final long authorId; private final UtcDateTime createdAt; private final String description; @@ -13,7 +13,6 @@ public final class DirectoryEntry { private final long entityId; private final GuildPreview guild; private final int primaryCategoryId; - private final int type; public final UtcDateTime a() { return this.createdAt; @@ -39,11 +38,11 @@ public final class DirectoryEntry { if (this == obj) { return true; } - if (!(obj instanceof DirectoryEntry)) { + if (!(obj instanceof DirectoryEntryGuild)) { return false; } - DirectoryEntry directoryEntry = (DirectoryEntry) obj; - return this.directoryChannelId == directoryEntry.directoryChannelId && this.entityId == directoryEntry.entityId && this.type == directoryEntry.type && this.authorId == directoryEntry.authorId && m.areEqual(this.description, directoryEntry.description) && this.primaryCategoryId == directoryEntry.primaryCategoryId && m.areEqual(this.guild, directoryEntry.guild) && m.areEqual(this.createdAt, directoryEntry.createdAt); + DirectoryEntryGuild directoryEntryGuild = (DirectoryEntryGuild) obj; + return this.directoryChannelId == directoryEntryGuild.directoryChannelId && this.entityId == directoryEntryGuild.entityId && this.authorId == directoryEntryGuild.authorId && m.areEqual(this.description, directoryEntryGuild.description) && this.primaryCategoryId == directoryEntryGuild.primaryCategoryId && m.areEqual(this.guild, directoryEntryGuild.guild) && m.areEqual(this.createdAt, directoryEntryGuild.createdAt); } public final int f() { @@ -54,7 +53,7 @@ public final class DirectoryEntry { long j = this.directoryChannelId; long j2 = this.entityId; long j3 = this.authorId; - int i = ((((((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + this.type) * 31) + ((int) (j3 ^ (j3 >>> 32)))) * 31; + int i = ((((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + ((int) (j3 ^ (j3 >>> 32)))) * 31; String str = this.description; int i2 = 0; int hashCode = (((i + (str != null ? str.hashCode() : 0)) * 31) + this.primaryCategoryId) * 31; @@ -68,12 +67,10 @@ public final class DirectoryEntry { } public String toString() { - StringBuilder R = a.R("DirectoryEntry(directoryChannelId="); + StringBuilder R = a.R("DirectoryEntryGuild(directoryChannelId="); R.append(this.directoryChannelId); R.append(", entityId="); R.append(this.entityId); - R.append(", type="); - R.append(this.type); R.append(", authorId="); R.append(this.authorId); R.append(", description="); diff --git a/app/src/main/java/com/discord/api/directory/DirectoryEntryType.java b/app/src/main/java/com/discord/api/directory/DirectoryEntryType.java new file mode 100644 index 0000000000..d606e5599f --- /dev/null +++ b/app/src/main/java/com/discord/api/directory/DirectoryEntryType.java @@ -0,0 +1,16 @@ +package com.discord.api.directory; +/* compiled from: DirectoryEntryGuild.kt */ +public enum DirectoryEntryType { + Guild(0), + GuildScheduledEvent(1); + + private final int key; + + private DirectoryEntryType(int i) { + this.key = i; + } + + public final int getKey() { + return this.key; + } +} diff --git a/app/src/main/java/com/discord/api/guild/Guild.java b/app/src/main/java/com/discord/api/guild/Guild.java index 48f5d840d4..83061cf865 100644 --- a/app/src/main/java/com/discord/api/guild/Guild.java +++ b/app/src/main/java/com/discord/api/guild/Guild.java @@ -35,6 +35,7 @@ public final class Guild { private final List features; private final GuildHashes guildHashes; private final List guildScheduledEvents; + private final GuildHubType hubType; private final String icon; /* renamed from: id reason: collision with root package name */ @@ -70,7 +71,7 @@ public final class Guild { /* JADX DEBUG: Multi-variable search result rejected for r29v0, resolved type: java.util.List */ /* JADX WARN: Multi-variable type inference failed */ - public Guild(List list, List list2, List list3, String str, String str2, Integer num, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, List list4, List list5, List list6, List list7, boolean z2, int i, int i2, Long l, Long l2, List list8, int i3, String str5, String str6, int i4, int i5, int i6, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i7, int i8, Integer num2, GuildHashes guildHashes, List list9, List list10, boolean z3, List list11, List list12, List list13) { + public Guild(List list, List list2, List list3, String str, String str2, Integer num, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, List list4, List list5, List list6, List list7, boolean z2, int i, int i2, Long l, Long l2, List list8, int i3, String str5, String str6, int i4, int i5, int i6, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i7, int i8, Integer num2, GuildHashes guildHashes, List list9, List list10, boolean z3, List list11, List list12, List list13, GuildHubType guildHubType) { m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME); m.checkNotNullParameter(list8, "features"); this.roles = list; @@ -118,9 +119,10 @@ public final class Guild { this.stageInstances = list11; this.guildScheduledEvents = list12; this.embeddedActivities = list13; + this.hubType = guildHubType; } - public static Guild a(Guild guild, List list, List list2, List list3, String str, String str2, Integer num, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, List list4, List list5, List list6, List list7, boolean z2, int i, int i2, Long l, Long l2, List list8, int i3, String str5, String str6, int i4, int i5, int i6, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i7, int i8, Integer num2, GuildHashes guildHashes, List list9, List list10, boolean z3, List list11, List list12, List list13, int i9, int i10) { + public static Guild a(Guild guild, List list, List list2, List list3, String str, String str2, Integer num, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, List list4, List list5, List list6, List list7, boolean z2, int i, int i2, Long l, Long l2, List list8, int i3, String str5, String str6, int i4, int i5, int i6, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i7, int i8, Integer num2, GuildHashes guildHashes, List list9, List list10, boolean z3, List list11, List list12, List list13, GuildHubType guildHubType, int i9, int i10) { List list14 = (i9 & 1) != 0 ? guild.roles : list; List list15 = (i9 & 2) != 0 ? guild.emojis : list2; List list16 = (i9 & 4) != 0 ? guild.stickers : list3; @@ -136,14 +138,14 @@ public final class Guild { List list17 = (i9 & 4096) != 0 ? guild.presences : list4; List list18 = (i9 & 8192) != 0 ? guild.channels : list5; List list19 = (i9 & 16384) != 0 ? guild.members : list6; - List list20 = null; - List list21 = (i9 & 32768) != 0 ? guild.voiceStates : null; + GuildHubType guildHubType2 = null; + List list20 = (i9 & 32768) != 0 ? guild.voiceStates : null; boolean z4 = (i9 & 65536) != 0 ? guild.unavailable : z2; int i11 = (i9 & 131072) != 0 ? guild.mfaLevel : i; int i12 = (i9 & 262144) != 0 ? guild.afkTimeout : i2; Long l5 = (i9 & 524288) != 0 ? guild.afkChannelId : l; Long l6 = (i9 & 1048576) != 0 ? guild.systemChannelId : l2; - List list22 = (i9 & 2097152) != 0 ? guild.features : list8; + List list21 = (i9 & 2097152) != 0 ? guild.features : list8; int i13 = (i9 & 4194304) != 0 ? guild.memberCount : i3; String str14 = (i9 & 8388608) != 0 ? guild.banner : str5; String str15 = (i9 & 16777216) != 0 ? guild.splash : str6; @@ -161,89 +163,94 @@ public final class Guild { int i18 = (i10 & 16) != 0 ? guild.approximatePresenceCount : i8; Integer num4 = (i10 & 32) != 0 ? guild.permissions : null; GuildHashes guildHashes2 = (i10 & 64) != 0 ? guild.guildHashes : null; - List list23 = (i10 & 128) != 0 ? guild.channelUpdates : null; - List list24 = (i10 & 256) != 0 ? guild.threads : null; + List list22 = (i10 & 128) != 0 ? guild.channelUpdates : null; + List list23 = (i10 & 256) != 0 ? guild.threads : null; boolean z5 = (i10 & 512) != 0 ? guild.nsfw : z3; - List list25 = (i10 & 1024) != 0 ? guild.stageInstances : null; - List list26 = (i10 & 2048) != 0 ? guild.guildScheduledEvents : null; - if ((i10 & 4096) != 0) { - list20 = guild.embeddedActivities; + List list24 = (i10 & 1024) != 0 ? guild.stageInstances : null; + List list25 = (i10 & 2048) != 0 ? guild.guildScheduledEvents : null; + List list26 = (i10 & 4096) != 0 ? guild.embeddedActivities : null; + if ((i10 & 8192) != 0) { + guildHubType2 = guild.hubType; } Objects.requireNonNull(guild); m.checkNotNullParameter(str10, ModelAuditLogEntry.CHANGE_KEY_NAME); - m.checkNotNullParameter(list22, "features"); - return new Guild(list14, list15, list16, str10, str11, num3, j3, str12, j4, str13, guildVerificationLevel2, guildExplicitContentFilter2, list17, list18, list19, list21, z4, i11, i12, l5, l6, list22, i13, str14, str15, i14, i15, i16, str16, l7, l8, str17, guildWelcomeScreen2, guildMaxVideoChannelUsers2, str18, i17, i18, num4, guildHashes2, list23, list24, z5, list25, list26, list20); + m.checkNotNullParameter(list21, "features"); + return new Guild(list14, list15, list16, str10, str11, num3, j3, str12, j4, str13, guildVerificationLevel2, guildExplicitContentFilter2, list17, list18, list19, list20, z4, i11, i12, l5, l6, list21, i13, str14, str15, i14, i15, i16, str16, l7, l8, str17, guildWelcomeScreen2, guildMaxVideoChannelUsers2, str18, i17, i18, num4, guildHashes2, list22, list23, z5, list24, list25, list26, guildHubType2); } - public final int A() { - return this.premiumSubscriptionCount; + public final String A() { + return this.preferredLocale; } public final int B() { + return this.premiumSubscriptionCount; + } + + public final int C() { return this.premiumTier; } - public final List C() { + public final List D() { return this.presences; } - public final Long D() { + public final Long E() { return this.publicUpdatesChannelId; } - public final String E() { + public final String F() { return this.region; } - public final List F() { + public final List G() { return this.roles; } - public final Long G() { + public final Long H() { return this.rulesChannelId; } - public final String H() { + public final String I() { return this.splash; } - public final List I() { + public final List J() { return this.stageInstances; } - public final List J() { + public final List K() { return this.stickers; } - public final int K() { + public final int L() { return this.systemChannelFlags; } - public final Long L() { + public final Long M() { return this.systemChannelId; } - public final List M() { + public final List N() { return this.threads; } - public final boolean N() { + public final boolean O() { return this.unavailable; } - public final String O() { + public final String P() { return this.vanityUrlCode; } - public final GuildVerificationLevel P() { + public final GuildVerificationLevel Q() { return this.verificationLevel; } - public final List Q() { + public final List R() { return this.voiceStates; } - public final GuildWelcomeScreen R() { + public final GuildWelcomeScreen S() { return this.welcomeScreen; } @@ -271,7 +278,7 @@ public final class Guild { return false; } Guild guild = (Guild) obj; - return m.areEqual(this.roles, guild.roles) && m.areEqual(this.emojis, guild.emojis) && m.areEqual(this.stickers, guild.stickers) && m.areEqual(this.name, guild.name) && m.areEqual(this.description, guild.description) && m.areEqual(this.defaultMessageNotifications, guild.defaultMessageNotifications) && this.f1624id == guild.f1624id && m.areEqual(this.region, guild.region) && this.ownerId == guild.ownerId && m.areEqual(this.icon, guild.icon) && m.areEqual(this.verificationLevel, guild.verificationLevel) && m.areEqual(this.explicitContentFilter, guild.explicitContentFilter) && m.areEqual(this.presences, guild.presences) && m.areEqual(this.channels, guild.channels) && m.areEqual(this.members, guild.members) && m.areEqual(this.voiceStates, guild.voiceStates) && this.unavailable == guild.unavailable && this.mfaLevel == guild.mfaLevel && this.afkTimeout == guild.afkTimeout && m.areEqual(this.afkChannelId, guild.afkChannelId) && m.areEqual(this.systemChannelId, guild.systemChannelId) && m.areEqual(this.features, guild.features) && this.memberCount == guild.memberCount && m.areEqual(this.banner, guild.banner) && m.areEqual(this.splash, guild.splash) && this.premiumTier == guild.premiumTier && this.premiumSubscriptionCount == guild.premiumSubscriptionCount && this.systemChannelFlags == guild.systemChannelFlags && m.areEqual(this.joinedAt, guild.joinedAt) && m.areEqual(this.rulesChannelId, guild.rulesChannelId) && m.areEqual(this.publicUpdatesChannelId, guild.publicUpdatesChannelId) && m.areEqual(this.preferredLocale, guild.preferredLocale) && m.areEqual(this.welcomeScreen, guild.welcomeScreen) && m.areEqual(this.maxVideoChannelUsers, guild.maxVideoChannelUsers) && m.areEqual(this.vanityUrlCode, guild.vanityUrlCode) && this.approximateMemberCount == guild.approximateMemberCount && this.approximatePresenceCount == guild.approximatePresenceCount && m.areEqual(this.permissions, guild.permissions) && m.areEqual(this.guildHashes, guild.guildHashes) && m.areEqual(this.channelUpdates, guild.channelUpdates) && m.areEqual(this.threads, guild.threads) && this.nsfw == guild.nsfw && m.areEqual(this.stageInstances, guild.stageInstances) && m.areEqual(this.guildScheduledEvents, guild.guildScheduledEvents) && m.areEqual(this.embeddedActivities, guild.embeddedActivities); + return m.areEqual(this.roles, guild.roles) && m.areEqual(this.emojis, guild.emojis) && m.areEqual(this.stickers, guild.stickers) && m.areEqual(this.name, guild.name) && m.areEqual(this.description, guild.description) && m.areEqual(this.defaultMessageNotifications, guild.defaultMessageNotifications) && this.f1624id == guild.f1624id && m.areEqual(this.region, guild.region) && this.ownerId == guild.ownerId && m.areEqual(this.icon, guild.icon) && m.areEqual(this.verificationLevel, guild.verificationLevel) && m.areEqual(this.explicitContentFilter, guild.explicitContentFilter) && m.areEqual(this.presences, guild.presences) && m.areEqual(this.channels, guild.channels) && m.areEqual(this.members, guild.members) && m.areEqual(this.voiceStates, guild.voiceStates) && this.unavailable == guild.unavailable && this.mfaLevel == guild.mfaLevel && this.afkTimeout == guild.afkTimeout && m.areEqual(this.afkChannelId, guild.afkChannelId) && m.areEqual(this.systemChannelId, guild.systemChannelId) && m.areEqual(this.features, guild.features) && this.memberCount == guild.memberCount && m.areEqual(this.banner, guild.banner) && m.areEqual(this.splash, guild.splash) && this.premiumTier == guild.premiumTier && this.premiumSubscriptionCount == guild.premiumSubscriptionCount && this.systemChannelFlags == guild.systemChannelFlags && m.areEqual(this.joinedAt, guild.joinedAt) && m.areEqual(this.rulesChannelId, guild.rulesChannelId) && m.areEqual(this.publicUpdatesChannelId, guild.publicUpdatesChannelId) && m.areEqual(this.preferredLocale, guild.preferredLocale) && m.areEqual(this.welcomeScreen, guild.welcomeScreen) && m.areEqual(this.maxVideoChannelUsers, guild.maxVideoChannelUsers) && m.areEqual(this.vanityUrlCode, guild.vanityUrlCode) && this.approximateMemberCount == guild.approximateMemberCount && this.approximatePresenceCount == guild.approximatePresenceCount && m.areEqual(this.permissions, guild.permissions) && m.areEqual(this.guildHashes, guild.guildHashes) && m.areEqual(this.channelUpdates, guild.channelUpdates) && m.areEqual(this.threads, guild.threads) && this.nsfw == guild.nsfw && m.areEqual(this.stageInstances, guild.stageInstances) && m.areEqual(this.guildScheduledEvents, guild.guildScheduledEvents) && m.areEqual(this.embeddedActivities, guild.embeddedActivities) && m.areEqual(this.hubType, guild.hubType); } public final List f() { @@ -371,10 +378,12 @@ public final class Guild { List list12 = this.guildScheduledEvents; int hashCode32 = (hashCode31 + (list12 != null ? list12.hashCode() : 0)) * 31; List list13 = this.embeddedActivities; - if (list13 != null) { - i = list13.hashCode(); + int hashCode33 = (hashCode32 + (list13 != null ? list13.hashCode() : 0)) * 31; + GuildHubType guildHubType = this.hubType; + if (guildHubType != null) { + i = guildHubType.hashCode(); } - return hashCode32 + i; + return hashCode33 + i; } public final String i() { @@ -405,26 +414,26 @@ public final class Guild { return this.guildScheduledEvents; } - public final String p() { + public final GuildHubType p() { + return this.hubType; + } + + public final String q() { return this.icon; } - public final long q() { + public final long r() { return this.f1624id; } - public final String r() { + public final String s() { return this.joinedAt; } - public final GuildMaxVideoChannelUsers s() { + public final GuildMaxVideoChannelUsers t() { return this.maxVideoChannelUsers; } - public final int t() { - return this.memberCount; - } - public String toString() { StringBuilder R = a.R("Guild(roles="); R.append(this.roles); @@ -515,30 +524,34 @@ public final class Guild { R.append(", guildScheduledEvents="); R.append(this.guildScheduledEvents); R.append(", embeddedActivities="); - return a.J(R, this.embeddedActivities, ")"); + R.append(this.embeddedActivities); + R.append(", hubType="); + R.append(this.hubType); + R.append(")"); + return R.toString(); } - public final List u() { + public final int u() { + return this.memberCount; + } + + public final List v() { return this.members; } - public final int v() { + public final int w() { return this.mfaLevel; } - public final String w() { + public final String x() { return this.name; } - public final boolean x() { + public final boolean y() { return this.nsfw; } - public final long y() { + public final long z() { return this.ownerId; } - - public final String z() { - return this.preferredLocale; - } } diff --git a/app/src/main/java/com/discord/api/guild/GuildHubType.java b/app/src/main/java/com/discord/api/guild/GuildHubType.java new file mode 100644 index 0000000000..7a42ca52a8 --- /dev/null +++ b/app/src/main/java/com/discord/api/guild/GuildHubType.java @@ -0,0 +1,17 @@ +package com.discord.api.guild; +/* compiled from: GuildHubType.kt */ +public enum GuildHubType { + DEFAULT(0), + HIGH_SCHOOL(1), + COLLEGE(2); + + private final int apiValue; + + private GuildHubType(int i) { + this.apiValue = i; + } + + public final int getApiValue() { + return this.apiValue; + } +} diff --git a/app/src/main/java/com/discord/api/guild/GuildHubTypeTypeAdapter.java b/app/src/main/java/com/discord/api/guild/GuildHubTypeTypeAdapter.java new file mode 100644 index 0000000000..dcab356155 --- /dev/null +++ b/app/src/main/java/com/discord/api/guild/GuildHubTypeTypeAdapter.java @@ -0,0 +1,36 @@ +package com.discord.api.guild; + +import c.c.a.a0.d; +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import d0.z.d.m; +/* compiled from: GuildHubType.kt */ +public final class GuildHubTypeTypeAdapter extends TypeAdapter { + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // com.google.gson.TypeAdapter + public GuildHubType read(JsonReader jsonReader) { + m.checkNotNullParameter(jsonReader, "in"); + Integer l1 = d.l1(jsonReader); + GuildHubType[] values = GuildHubType.values(); + for (int i = 0; i < 3; i++) { + GuildHubType guildHubType = values[i]; + if (l1 != null && guildHubType.getApiValue() == l1.intValue()) { + return guildHubType; + } + } + return null; + } + + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [com.google.gson.stream.JsonWriter, java.lang.Object] */ + @Override // com.google.gson.TypeAdapter + public void write(JsonWriter jsonWriter, GuildHubType guildHubType) { + GuildHubType guildHubType2 = guildHubType; + m.checkNotNullParameter(jsonWriter, "out"); + if (guildHubType2 == null) { + jsonWriter.s(); + } else { + jsonWriter.D(Integer.valueOf(guildHubType2.getApiValue())); + } + } +} diff --git a/app/src/main/java/com/discord/app/App.java b/app/src/main/java/com/discord/app/App.java index 446d4ef208..645b9d0274 100644 --- a/app/src/main/java/com/discord/app/App.java +++ b/app/src/main/java/com/discord/app/App.java @@ -45,8 +45,9 @@ import kotlin.jvm.functions.Function3; import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: App.kt */ public class App extends Application { - public static final boolean j = w.contains$default((CharSequence) BuildConfig.FLAVOR, (CharSequence) "local", false, 2, (Object) null); - public static final a k = new a(null); + public static final a Companion = new a(null); + private static final boolean IS_LOCAL = w.contains$default((CharSequence) BuildConfig.FLAVOR, (CharSequence) "local", false, 2, (Object) null); + private final boolean isUnderTest; /* compiled from: App.kt */ public static final class a { @@ -157,6 +158,22 @@ public class App extends Application { } } + public static final /* synthetic */ boolean access$getIS_LOCAL$cp() { + return IS_LOCAL; + } + + public void initializeFlipper() { + m.checkNotNullParameter(this, "context"); + } + + public void initializeRLottie() { + System.loadLibrary("dsti"); + } + + public boolean isUnderTest() { + return this.isUnderTest; + } + @Override // android.app.Application public void onCreate() { super.onCreate(); @@ -191,7 +208,7 @@ public class App extends Application { } appLog.recordBreadcrumb(str, "libdiscord_version"); DebugPrintableCollection.Companion.initialize(str); - AdjustConfig.INSTANCE.init(this, false); + AdjustConfig.INSTANCE.init(this, isUnderTest()); c.a.e.d dVar = c.a.e.d.d; b bVar = b.j; m.checkNotNullParameter(this, "application"); @@ -220,8 +237,8 @@ public class App extends Application { ModelEmojiCustom.setCdnUri(BuildConfig.HOST_CDN); SurveyUtils.INSTANCE.init(this); AppCompatDelegate.setDefaultNightMode(1); - m.checkNotNullParameter(this, "context"); - System.loadLibrary("dsti"); + initializeFlipper(); + initializeRLottie(); Objects.requireNonNull(appLog); if (FirebaseCrashlytics.getInstance().didCrashOnPreviousExecution()) { AnalyticsTracker.INSTANCE.appCrashed(); diff --git a/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1.java b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1.java new file mode 100644 index 0000000000..4154f60537 --- /dev/null +++ b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1.java @@ -0,0 +1,74 @@ +package com.discord.models.experiments.dto; + +import com.discord.api.guild.GuildHubType; +import com.discord.models.deserialization.gson.InboundGatewayGsonParser; +import com.discord.models.domain.Model; +import d0.t.u; +import d0.z.d.m; +import java.util.List; +import kotlin.jvm.internal.Ref$ObjectRef; +/* compiled from: GuildExperimentFilter.kt */ +public final class GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1 implements Runnable { + public final /* synthetic */ Ref$ObjectRef $hubTypes; + public final /* synthetic */ Model.JsonReader $reader; + + /* compiled from: GuildExperimentFilter.kt */ + /* renamed from: com.discord.models.experiments.dto.GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1$1 reason: invalid class name */ + public static final class AnonymousClass1 implements Runnable { + public final /* synthetic */ GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1 this$0; + + public AnonymousClass1(GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1 guildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1) { + this.this$0 = guildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1; + } + + @Override // java.lang.Runnable + public final void run() { + this.this$0.$reader.skipValue(); + } + } + + /* compiled from: GuildExperimentFilter.kt */ + /* renamed from: com.discord.models.experiments.dto.GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1$2 reason: invalid class name */ + public static final class AnonymousClass2 implements Runnable { + public final /* synthetic */ GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1 this$0; + + /* compiled from: GuildExperimentFilter.kt */ + /* renamed from: com.discord.models.experiments.dto.GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1$2$1 reason: invalid class name */ + public static final class AnonymousClass1 implements Model.JsonReader.ItemFactory { + public final /* synthetic */ AnonymousClass2 this$0; + + public AnonymousClass1(AnonymousClass2 r1) { + this.this$0 = r1; + } + + @Override // com.discord.models.domain.Model.JsonReader.ItemFactory + public final GuildHubType get() { + return (GuildHubType) InboundGatewayGsonParser.fromJson(this.this$0.this$0.$reader, GuildHubType.class); + } + } + + public AnonymousClass2(GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1 guildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1) { + this.this$0 = guildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1; + } + + /* JADX WARNING: Unknown variable types count: 1 */ + @Override // java.lang.Runnable + public final void run() { + GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1 guildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1 = this.this$0; + Ref$ObjectRef ref$ObjectRef = guildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1.$hubTypes; + List nextList = guildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1.$reader.nextList(new AnonymousClass1(this)); + m.checkNotNullExpressionValue(nextList, "reader.nextList {\n …ass.java)\n }"); + ref$ObjectRef.element = u.toSet(nextList); + } + } + + public GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1(Model.JsonReader jsonReader, Ref$ObjectRef ref$ObjectRef) { + this.$reader = jsonReader; + this.$hubTypes = ref$ObjectRef; + } + + @Override // java.lang.Runnable + public final void run() { + this.$reader.nextListIndexed(new AnonymousClass1(this), new AnonymousClass2(this)); + } +} diff --git a/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter$Parser$parsers$5.java b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter$Parser$parsers$5.java new file mode 100644 index 0000000000..2f8fd49023 --- /dev/null +++ b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter$Parser$parsers$5.java @@ -0,0 +1,18 @@ +package com.discord.models.experiments.dto; + +import com.discord.models.domain.Model; +import com.discord.models.experiments.dto.GuildExperimentFilter; +import d0.z.d.k; +import d0.z.d.m; +import kotlin.jvm.functions.Function1; +/* compiled from: GuildExperimentFilter.kt */ +public final /* synthetic */ class GuildExperimentFilter$Parser$parsers$5 extends k implements Function1 { + public GuildExperimentFilter$Parser$parsers$5(GuildExperimentFilter.Parser parser) { + super(1, parser, GuildExperimentFilter.Parser.class, "parseGuildHubTypesFeatureFilter", "parseGuildHubTypesFeatureFilter(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/experiments/dto/GuildExperimentFilter$GuildHubTypesFeatureFilter;", 0); + } + + public final GuildExperimentFilter.GuildHubTypesFeatureFilter invoke(Model.JsonReader jsonReader) { + m.checkNotNullParameter(jsonReader, "p1"); + return GuildExperimentFilter.Parser.access$parseGuildHubTypesFeatureFilter((GuildExperimentFilter.Parser) this.receiver, jsonReader); + } +} diff --git a/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter.java b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter.java index 557c2cd2c7..c40ab6d454 100644 --- a/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter.java +++ b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter.java @@ -3,6 +3,7 @@ package com.discord.models.experiments.dto; import androidx.recyclerview.widget.RecyclerView; import c.d.b.a.a; import com.discord.api.guild.GuildFeature; +import com.discord.api.guild.GuildHubType; import com.discord.models.domain.Model; import com.discord.models.experiments.domain.ExperimentHash; import d0.o; @@ -79,6 +80,64 @@ public abstract class GuildExperimentFilter { } } + /* compiled from: GuildExperimentFilter.kt */ + public static final class GuildHubTypesFeatureFilter extends GuildExperimentFilter { + private final Set hubTypes; + + /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.Set */ + /* JADX WARN: Multi-variable type inference failed */ + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public GuildHubTypesFeatureFilter(Set set) { + super(null); + m.checkNotNullParameter(set, "hubTypes"); + this.hubTypes = set; + } + + /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.models.experiments.dto.GuildExperimentFilter$GuildHubTypesFeatureFilter */ + /* JADX WARN: Multi-variable type inference failed */ + public static /* synthetic */ GuildHubTypesFeatureFilter copy$default(GuildHubTypesFeatureFilter guildHubTypesFeatureFilter, Set set, int i, Object obj) { + if ((i & 1) != 0) { + set = guildHubTypesFeatureFilter.hubTypes; + } + return guildHubTypesFeatureFilter.copy(set); + } + + public final Set component1() { + return this.hubTypes; + } + + public final GuildHubTypesFeatureFilter copy(Set set) { + m.checkNotNullParameter(set, "hubTypes"); + return new GuildHubTypesFeatureFilter(set); + } + + public boolean equals(Object obj) { + if (this != obj) { + return (obj instanceof GuildHubTypesFeatureFilter) && m.areEqual(this.hubTypes, ((GuildHubTypesFeatureFilter) obj).hubTypes); + } + return true; + } + + public final Set getHubTypes() { + return this.hubTypes; + } + + public int hashCode() { + Set set = this.hubTypes; + if (set != null) { + return set.hashCode(); + } + return 0; + } + + public String toString() { + StringBuilder R = a.R("GuildHubTypesFeatureFilter(hubTypes="); + R.append(this.hubTypes); + R.append(")"); + return R.toString(); + } + } + /* compiled from: GuildExperimentFilter.kt */ public static final class GuildIdRangeFilter extends GuildExperimentFilter { private final LongRange range; @@ -254,7 +313,7 @@ public abstract class GuildExperimentFilter { Parser parser = new Parser(); INSTANCE = parser; ExperimentHash experimentHash = ExperimentHash.INSTANCE; - parsers = h0.mapOf(o.to(Long.valueOf(experimentHash.from("guild_ids")), new GuildExperimentFilter$Parser$parsers$1(parser)), o.to(Long.valueOf(experimentHash.from("guild_id_range")), new GuildExperimentFilter$Parser$parsers$2(parser)), o.to(Long.valueOf(experimentHash.from("guild_member_count_range")), new GuildExperimentFilter$Parser$parsers$3(parser)), o.to(Long.valueOf(experimentHash.from("guild_has_feature")), new GuildExperimentFilter$Parser$parsers$4(parser))); + parsers = h0.mapOf(o.to(Long.valueOf(experimentHash.from("guild_ids")), new GuildExperimentFilter$Parser$parsers$1(parser)), o.to(Long.valueOf(experimentHash.from("guild_id_range")), new GuildExperimentFilter$Parser$parsers$2(parser)), o.to(Long.valueOf(experimentHash.from("guild_member_count_range")), new GuildExperimentFilter$Parser$parsers$3(parser)), o.to(Long.valueOf(experimentHash.from("guild_has_feature")), new GuildExperimentFilter$Parser$parsers$4(parser)), o.to(Long.valueOf(experimentHash.from("guild_hub_types")), new GuildExperimentFilter$Parser$parsers$5(parser))); MIN_ID_HASH = experimentHash.from("min_id"); MAX_ID_HASH = experimentHash.from("max_id"); } @@ -274,6 +333,10 @@ public abstract class GuildExperimentFilter { return parser.parseGuildHasFeatureFilter(jsonReader); } + public static final /* synthetic */ GuildHubTypesFeatureFilter access$parseGuildHubTypesFeatureFilter(Parser parser, Model.JsonReader jsonReader) { + return parser.parseGuildHubTypesFeatureFilter(jsonReader); + } + public static final /* synthetic */ GuildIdRangeFilter access$parseGuildIdRangeFilter(Parser parser, Model.JsonReader jsonReader) { return parser.parseGuildIdRangeFilter(jsonReader); } @@ -294,6 +357,14 @@ public abstract class GuildExperimentFilter { return new GuildHasFeatureFilter(ref$ObjectRef.element); } + /* JADX WARNING: Unknown variable types count: 1 */ + private final GuildHubTypesFeatureFilter parseGuildHubTypesFeatureFilter(Model.JsonReader jsonReader) { + Ref$ObjectRef ref$ObjectRef = new Ref$ObjectRef(); + ref$ObjectRef.element = n0.emptySet(); + jsonReader.nextListIndexed(new GuildExperimentFilter$Parser$parseGuildHubTypesFeatureFilter$1(jsonReader, ref$ObjectRef)); + return new GuildHubTypesFeatureFilter(ref$ObjectRef.element); + } + private final GuildIdRangeFilter parseGuildIdRangeFilter(Model.JsonReader jsonReader) { return new GuildIdRangeFilter(parseRange(jsonReader)); } diff --git a/app/src/main/java/com/discord/models/guild/Guild.java b/app/src/main/java/com/discord/models/guild/Guild.java index c6c0718ba5..d9d2586a77 100644 --- a/app/src/main/java/com/discord/models/guild/Guild.java +++ b/app/src/main/java/com/discord/models/guild/Guild.java @@ -6,6 +6,7 @@ import c.d.b.a.a; import com.discord.api.emoji.GuildEmoji; import com.discord.api.guild.GuildExplicitContentFilter; import com.discord.api.guild.GuildFeature; +import com.discord.api.guild.GuildHubType; import com.discord.api.guild.GuildMaxVideoChannelUsers; import com.discord.api.guild.GuildVerificationLevel; import com.discord.api.guild.welcome.GuildWelcomeScreen; @@ -32,6 +33,7 @@ public final class Guild { private final List emojis; private final GuildExplicitContentFilter explicitContentFilter; private final Set features; + private final GuildHubType hubType; private final String icon; /* renamed from: id reason: collision with root package name */ @@ -61,52 +63,52 @@ public final class Guild { private final GuildWelcomeScreen welcomeScreen; public Guild() { - this(null, null, null, null, null, 0, 0, null, 0, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, false, -1, 1, null); + this(null, null, null, null, null, 0, 0, null, 0, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, false, null, -1, 3, null); } /* JADX WARNING: Illegal instructions before constructor call */ public Guild(com.discord.api.guild.Guild guild) { - this(r0, r0, null, r6, r7, r0, r9, r11, r12, r14, r0, r0, r17, r18, r19, r20, r21, r22, r23, r24, r25, r26, r27, r28, r29, r30, r31, r32, r33, r0 == null ? GuildMaxVideoChannelUsers.Unlimited.INSTANCE : r0, guild.O(), guild.d(), guild.x(), 4, 0, null); + this(r0, r0, null, r6, r7, r0, r9, r11, r12, r14, r0, r0, r17, r18, r19, r20, r21, r22, r23, r24, r25, r26, r27, r28, r29, r30, r31, r32, r33, r0 == null ? GuildMaxVideoChannelUsers.Unlimited.INSTANCE : r0, guild.P(), guild.d(), guild.y(), guild.p(), 4, 0, null); m.checkNotNullParameter(guild, "apiGuild"); - List F = guild.F(); - F = F == null ? n.emptyList() : F; + List G = guild.G(); + G = G == null ? n.emptyList() : G; List k = guild.k(); k = k == null ? n.emptyList() : k; - String w = guild.w(); + String x2 = guild.x(); String i = guild.i(); Integer h = guild.h(); int intValue = h != null ? h.intValue() : ModelNotificationSettings.FREQUENCY_ALL; - long q = guild.q(); - String E = guild.E(); - long y2 = guild.y(); - String p = guild.p(); - GuildVerificationLevel P = guild.P(); - P = P == null ? GuildVerificationLevel.NONE : P; + long r = guild.r(); + String F = guild.F(); + long z2 = guild.z(); + String q = guild.q(); + GuildVerificationLevel Q = guild.Q(); + Q = Q == null ? GuildVerificationLevel.NONE : Q; GuildExplicitContentFilter l = guild.l(); l = l == null ? GuildExplicitContentFilter.NONE : l; - boolean N = guild.N(); - int v = guild.v(); + boolean O = guild.O(); + int w = guild.w(); int c2 = guild.c(); Long b = guild.b(); - Long L = guild.L(); + Long M = guild.M(); Set set = u.toSet(guild.m()); - int t = guild.t(); + int u = guild.u(); String e = guild.e(); - String H = guild.H(); + String I = guild.I(); + int C = guild.C(); int B = guild.B(); - int A = guild.A(); - int K = guild.K(); - String r = guild.r(); - Long G = guild.G(); - Long D = guild.D(); - String z2 = guild.z(); - GuildWelcomeScreen R = guild.R(); - GuildMaxVideoChannelUsers s2 = guild.s(); + int L = guild.L(); + String s2 = guild.s(); + Long H = guild.H(); + Long E = guild.E(); + String A = guild.A(); + GuildWelcomeScreen S = guild.S(); + GuildMaxVideoChannelUsers t = guild.t(); } /* JADX DEBUG: Multi-variable search result rejected for r30v0, resolved type: java.util.Set */ /* JADX WARN: Multi-variable type inference failed */ - public Guild(List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3) { + public Guild(List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3, GuildHubType guildHubType) { m.checkNotNullParameter(list, "roles"); m.checkNotNullParameter(list2, "emojis"); m.checkNotNullParameter(list3, "stickers"); @@ -148,16 +150,17 @@ public final class Guild { this.vanityUrlCode = str9; this.approximatePresenceCount = i8; this.nsfw = z3; + this.hubType = guildHubType; this.shortName = GuildUtilsKt.computeShortName(str); } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ Guild(List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3, int i9, int i10, DefaultConstructorMarker defaultConstructorMarker) { - this((i9 & 1) != 0 ? n.emptyList() : list, (i9 & 2) != 0 ? n.emptyList() : list2, (i9 & 4) != 0 ? n.emptyList() : list3, (i9 & 8) != 0 ? "" : str, (i9 & 16) != 0 ? null : str2, (i9 & 32) != 0 ? ModelNotificationSettings.FREQUENCY_ALL : i, (i9 & 64) != 0 ? 0 : j, (i9 & 128) != 0 ? null : str3, (i9 & 256) == 0 ? j2 : 0, (i9 & 512) != 0 ? null : str4, (i9 & 1024) != 0 ? GuildVerificationLevel.NONE : guildVerificationLevel, (i9 & 2048) != 0 ? GuildExplicitContentFilter.NONE : guildExplicitContentFilter, (i9 & 4096) != 0 ? false : z2, (i9 & 8192) != 0 ? 0 : i2, (i9 & 16384) != 0 ? 0 : i3, (i9 & 32768) != 0 ? null : l, (i9 & 65536) != 0 ? null : l2, (i9 & 131072) != 0 ? n0.emptySet() : set, (i9 & 262144) != 0 ? 0 : i4, (i9 & 524288) != 0 ? null : str5, (i9 & 1048576) != 0 ? null : str6, (i9 & 2097152) != 0 ? 0 : i5, (i9 & 4194304) != 0 ? 0 : i6, (i9 & 8388608) != 0 ? 0 : i7, (i9 & 16777216) != 0 ? null : str7, (i9 & 33554432) != 0 ? null : l3, (i9 & 67108864) != 0 ? null : l4, (i9 & 134217728) != 0 ? null : str8, (i9 & 268435456) != 0 ? null : guildWelcomeScreen, (i9 & 536870912) != 0 ? GuildMaxVideoChannelUsers.Unlimited.INSTANCE : guildMaxVideoChannelUsers, (i9 & BasicMeasure.EXACTLY) != 0 ? null : str9, (i9 & Integer.MIN_VALUE) != 0 ? 0 : i8, (i10 & 1) == 0 ? z3 : false); + public /* synthetic */ Guild(List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3, GuildHubType guildHubType, int i9, int i10, DefaultConstructorMarker defaultConstructorMarker) { + this((i9 & 1) != 0 ? n.emptyList() : list, (i9 & 2) != 0 ? n.emptyList() : list2, (i9 & 4) != 0 ? n.emptyList() : list3, (i9 & 8) != 0 ? "" : str, (i9 & 16) != 0 ? null : str2, (i9 & 32) != 0 ? ModelNotificationSettings.FREQUENCY_ALL : i, (i9 & 64) != 0 ? 0 : j, (i9 & 128) != 0 ? null : str3, (i9 & 256) == 0 ? j2 : 0, (i9 & 512) != 0 ? null : str4, (i9 & 1024) != 0 ? GuildVerificationLevel.NONE : guildVerificationLevel, (i9 & 2048) != 0 ? GuildExplicitContentFilter.NONE : guildExplicitContentFilter, (i9 & 4096) != 0 ? false : z2, (i9 & 8192) != 0 ? 0 : i2, (i9 & 16384) != 0 ? 0 : i3, (i9 & 32768) != 0 ? null : l, (i9 & 65536) != 0 ? null : l2, (i9 & 131072) != 0 ? n0.emptySet() : set, (i9 & 262144) != 0 ? 0 : i4, (i9 & 524288) != 0 ? null : str5, (i9 & 1048576) != 0 ? null : str6, (i9 & 2097152) != 0 ? 0 : i5, (i9 & 4194304) != 0 ? 0 : i6, (i9 & 8388608) != 0 ? 0 : i7, (i9 & 16777216) != 0 ? null : str7, (i9 & 33554432) != 0 ? null : l3, (i9 & 67108864) != 0 ? null : l4, (i9 & 134217728) != 0 ? null : str8, (i9 & 268435456) != 0 ? null : guildWelcomeScreen, (i9 & 536870912) != 0 ? GuildMaxVideoChannelUsers.Unlimited.INSTANCE : guildMaxVideoChannelUsers, (i9 & BasicMeasure.EXACTLY) != 0 ? null : str9, (i9 & Integer.MIN_VALUE) != 0 ? 0 : i8, (i10 & 1) == 0 ? z3 : false, (i10 & 2) != 0 ? null : guildHubType); } - public static /* synthetic */ Guild copy$default(Guild guild, List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3, int i9, int i10, Object obj) { - return guild.copy((i9 & 1) != 0 ? guild.roles : list, (i9 & 2) != 0 ? guild.emojis : list2, (i9 & 4) != 0 ? guild.stickers : list3, (i9 & 8) != 0 ? guild.name : str, (i9 & 16) != 0 ? guild.description : str2, (i9 & 32) != 0 ? guild.defaultMessageNotifications : i, (i9 & 64) != 0 ? guild.f2198id : j, (i9 & 128) != 0 ? guild.region : str3, (i9 & 256) != 0 ? guild.ownerId : j2, (i9 & 512) != 0 ? guild.icon : str4, (i9 & 1024) != 0 ? guild.verificationLevel : guildVerificationLevel, (i9 & 2048) != 0 ? guild.explicitContentFilter : guildExplicitContentFilter, (i9 & 4096) != 0 ? guild.unavailable : z2, (i9 & 8192) != 0 ? guild.mfaLevel : i2, (i9 & 16384) != 0 ? guild.afkTimeout : i3, (i9 & 32768) != 0 ? guild.afkChannelId : l, (i9 & 65536) != 0 ? guild.systemChannelId : l2, (i9 & 131072) != 0 ? guild.features : set, (i9 & 262144) != 0 ? guild.memberCount : i4, (i9 & 524288) != 0 ? guild.banner : str5, (i9 & 1048576) != 0 ? guild.splash : str6, (i9 & 2097152) != 0 ? guild.premiumTier : i5, (i9 & 4194304) != 0 ? guild.premiumSubscriptionCount : i6, (i9 & 8388608) != 0 ? guild.systemChannelFlags : i7, (i9 & 16777216) != 0 ? guild.joinedAt : str7, (i9 & 33554432) != 0 ? guild.rulesChannelId : l3, (i9 & 67108864) != 0 ? guild.publicUpdatesChannelId : l4, (i9 & 134217728) != 0 ? guild.preferredLocale : str8, (i9 & 268435456) != 0 ? guild.welcomeScreen : guildWelcomeScreen, (i9 & 536870912) != 0 ? guild.maxVideoChannelUsers : guildMaxVideoChannelUsers, (i9 & BasicMeasure.EXACTLY) != 0 ? guild.vanityUrlCode : str9, (i9 & Integer.MIN_VALUE) != 0 ? guild.approximatePresenceCount : i8, (i10 & 1) != 0 ? guild.nsfw : z3); + public static /* synthetic */ Guild copy$default(Guild guild, List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3, GuildHubType guildHubType, int i9, int i10, Object obj) { + return guild.copy((i9 & 1) != 0 ? guild.roles : list, (i9 & 2) != 0 ? guild.emojis : list2, (i9 & 4) != 0 ? guild.stickers : list3, (i9 & 8) != 0 ? guild.name : str, (i9 & 16) != 0 ? guild.description : str2, (i9 & 32) != 0 ? guild.defaultMessageNotifications : i, (i9 & 64) != 0 ? guild.f2198id : j, (i9 & 128) != 0 ? guild.region : str3, (i9 & 256) != 0 ? guild.ownerId : j2, (i9 & 512) != 0 ? guild.icon : str4, (i9 & 1024) != 0 ? guild.verificationLevel : guildVerificationLevel, (i9 & 2048) != 0 ? guild.explicitContentFilter : guildExplicitContentFilter, (i9 & 4096) != 0 ? guild.unavailable : z2, (i9 & 8192) != 0 ? guild.mfaLevel : i2, (i9 & 16384) != 0 ? guild.afkTimeout : i3, (i9 & 32768) != 0 ? guild.afkChannelId : l, (i9 & 65536) != 0 ? guild.systemChannelId : l2, (i9 & 131072) != 0 ? guild.features : set, (i9 & 262144) != 0 ? guild.memberCount : i4, (i9 & 524288) != 0 ? guild.banner : str5, (i9 & 1048576) != 0 ? guild.splash : str6, (i9 & 2097152) != 0 ? guild.premiumTier : i5, (i9 & 4194304) != 0 ? guild.premiumSubscriptionCount : i6, (i9 & 8388608) != 0 ? guild.systemChannelFlags : i7, (i9 & 16777216) != 0 ? guild.joinedAt : str7, (i9 & 33554432) != 0 ? guild.rulesChannelId : l3, (i9 & 67108864) != 0 ? guild.publicUpdatesChannelId : l4, (i9 & 134217728) != 0 ? guild.preferredLocale : str8, (i9 & 268435456) != 0 ? guild.welcomeScreen : guildWelcomeScreen, (i9 & 536870912) != 0 ? guild.maxVideoChannelUsers : guildMaxVideoChannelUsers, (i9 & BasicMeasure.EXACTLY) != 0 ? guild.vanityUrlCode : str9, (i9 & Integer.MIN_VALUE) != 0 ? guild.approximatePresenceCount : i8, (i10 & 1) != 0 ? guild.nsfw : z3, (i10 & 2) != 0 ? guild.hubType : guildHubType); } public final boolean canHaveBanner() { @@ -280,6 +283,10 @@ public final class Guild { return this.nsfw; } + public final GuildHubType component34() { + return this.hubType; + } + public final String component4() { return this.name; } @@ -304,7 +311,7 @@ public final class Guild { return this.ownerId; } - public final Guild copy(List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3) { + public final Guild copy(List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3, GuildHubType guildHubType) { m.checkNotNullParameter(list, "roles"); m.checkNotNullParameter(list2, "emojis"); m.checkNotNullParameter(list3, "stickers"); @@ -313,7 +320,7 @@ public final class Guild { m.checkNotNullParameter(guildExplicitContentFilter, "explicitContentFilter"); m.checkNotNullParameter(set, "features"); m.checkNotNullParameter(guildMaxVideoChannelUsers, "maxVideoChannelUsers"); - return new Guild(list, list2, list3, str, str2, i, j, str3, j2, str4, guildVerificationLevel, guildExplicitContentFilter, z2, i2, i3, l, l2, set, i4, str5, str6, i5, i6, i7, str7, l3, l4, str8, guildWelcomeScreen, guildMaxVideoChannelUsers, str9, i8, z3); + return new Guild(list, list2, list3, str, str2, i, j, str3, j2, str4, guildVerificationLevel, guildExplicitContentFilter, z2, i2, i3, l, l2, set, i4, str5, str6, i5, i6, i7, str7, l3, l4, str8, guildWelcomeScreen, guildMaxVideoChannelUsers, str9, i8, z3, guildHubType); } public boolean equals(Object obj) { @@ -324,7 +331,7 @@ public final class Guild { return false; } Guild guild = (Guild) obj; - return m.areEqual(this.roles, guild.roles) && m.areEqual(this.emojis, guild.emojis) && m.areEqual(this.stickers, guild.stickers) && m.areEqual(this.name, guild.name) && m.areEqual(this.description, guild.description) && this.defaultMessageNotifications == guild.defaultMessageNotifications && this.f2198id == guild.f2198id && m.areEqual(this.region, guild.region) && this.ownerId == guild.ownerId && m.areEqual(this.icon, guild.icon) && m.areEqual(this.verificationLevel, guild.verificationLevel) && m.areEqual(this.explicitContentFilter, guild.explicitContentFilter) && this.unavailable == guild.unavailable && this.mfaLevel == guild.mfaLevel && this.afkTimeout == guild.afkTimeout && m.areEqual(this.afkChannelId, guild.afkChannelId) && m.areEqual(this.systemChannelId, guild.systemChannelId) && m.areEqual(this.features, guild.features) && this.memberCount == guild.memberCount && m.areEqual(this.banner, guild.banner) && m.areEqual(this.splash, guild.splash) && this.premiumTier == guild.premiumTier && this.premiumSubscriptionCount == guild.premiumSubscriptionCount && this.systemChannelFlags == guild.systemChannelFlags && m.areEqual(this.joinedAt, guild.joinedAt) && m.areEqual(this.rulesChannelId, guild.rulesChannelId) && m.areEqual(this.publicUpdatesChannelId, guild.publicUpdatesChannelId) && m.areEqual(this.preferredLocale, guild.preferredLocale) && m.areEqual(this.welcomeScreen, guild.welcomeScreen) && m.areEqual(this.maxVideoChannelUsers, guild.maxVideoChannelUsers) && m.areEqual(this.vanityUrlCode, guild.vanityUrlCode) && this.approximatePresenceCount == guild.approximatePresenceCount && this.nsfw == guild.nsfw; + return m.areEqual(this.roles, guild.roles) && m.areEqual(this.emojis, guild.emojis) && m.areEqual(this.stickers, guild.stickers) && m.areEqual(this.name, guild.name) && m.areEqual(this.description, guild.description) && this.defaultMessageNotifications == guild.defaultMessageNotifications && this.f2198id == guild.f2198id && m.areEqual(this.region, guild.region) && this.ownerId == guild.ownerId && m.areEqual(this.icon, guild.icon) && m.areEqual(this.verificationLevel, guild.verificationLevel) && m.areEqual(this.explicitContentFilter, guild.explicitContentFilter) && this.unavailable == guild.unavailable && this.mfaLevel == guild.mfaLevel && this.afkTimeout == guild.afkTimeout && m.areEqual(this.afkChannelId, guild.afkChannelId) && m.areEqual(this.systemChannelId, guild.systemChannelId) && m.areEqual(this.features, guild.features) && this.memberCount == guild.memberCount && m.areEqual(this.banner, guild.banner) && m.areEqual(this.splash, guild.splash) && this.premiumTier == guild.premiumTier && this.premiumSubscriptionCount == guild.premiumSubscriptionCount && this.systemChannelFlags == guild.systemChannelFlags && m.areEqual(this.joinedAt, guild.joinedAt) && m.areEqual(this.rulesChannelId, guild.rulesChannelId) && m.areEqual(this.publicUpdatesChannelId, guild.publicUpdatesChannelId) && m.areEqual(this.preferredLocale, guild.preferredLocale) && m.areEqual(this.welcomeScreen, guild.welcomeScreen) && m.areEqual(this.maxVideoChannelUsers, guild.maxVideoChannelUsers) && m.areEqual(this.vanityUrlCode, guild.vanityUrlCode) && this.approximatePresenceCount == guild.approximatePresenceCount && this.nsfw == guild.nsfw && m.areEqual(this.hubType, guild.hubType); } public final Long getAfkChannelId() { @@ -363,6 +370,10 @@ public final class Guild { return this.features; } + public final GuildHubType getHubType() { + return this.hubType; + } + public final String getIcon() { return this.icon; } @@ -525,15 +536,17 @@ public final class Guild { GuildMaxVideoChannelUsers guildMaxVideoChannelUsers = this.maxVideoChannelUsers; int hashCode18 = (hashCode17 + (guildMaxVideoChannelUsers != null ? guildMaxVideoChannelUsers.hashCode() : 0)) * 31; String str9 = this.vanityUrlCode; - if (str9 != null) { - i = str9.hashCode(); - } - int i7 = (((hashCode18 + i) * 31) + this.approximatePresenceCount) * 31; + int hashCode19 = (((hashCode18 + (str9 != null ? str9.hashCode() : 0)) * 31) + this.approximatePresenceCount) * 31; boolean z3 = this.nsfw; if (!z3) { i2 = z3 ? 1 : 0; } - return i7 + i2; + int i7 = (hashCode19 + i2) * 31; + GuildHubType guildHubType = this.hubType; + if (guildHubType != null) { + i = guildHubType.hashCode(); + } + return i7 + i; } public final boolean isHub() { @@ -551,74 +564,74 @@ public final class Guild { if (k == null) { k = n.emptyList(); } - String w = guild.w(); + String x2 = guild.x(); String i = guild.i(); if (i == null) { i = this.description; } Integer h = guild.h(); int intValue = h != null ? h.intValue() : this.defaultMessageNotifications; - long q = guild.q() != 0 ? guild.q() : this.f2198id; - String E = guild.E(); - if (E == null) { - E = this.region; + long r = guild.r() != 0 ? guild.r() : this.f2198id; + String F = guild.F(); + if (F == null) { + F = this.region; } - long y2 = guild.y() != 0 ? guild.y() : this.ownerId; - String p = guild.p(); - if (p == null) { - p = this.icon; + long z2 = guild.z() != 0 ? guild.z() : this.ownerId; + String q = guild.q(); + if (q == null) { + q = this.icon; } - GuildVerificationLevel P = guild.P(); - if (P == null) { - P = this.verificationLevel; + GuildVerificationLevel Q = guild.Q(); + if (Q == null) { + Q = this.verificationLevel; } GuildExplicitContentFilter l = guild.l(); if (l == null) { l = this.explicitContentFilter; } - boolean N = guild.N(); - int v = guild.v(); + boolean O = guild.O(); + int w = guild.w(); int c2 = guild.c() != 0 ? guild.c() : this.afkTimeout; Long b = guild.b(); - Long L = guild.L(); + Long M = guild.M(); Set set = u.toSet(guild.m()); String e = guild.e(); - String H = guild.H(); - if (H == null) { - H = this.splash; + String I = guild.I(); + if (I == null) { + I = this.splash; } + int C = guild.C(); int B = guild.B(); - int A = guild.A(); - int K = guild.K(); - String r = guild.r(); - if (r == null) { - r = this.joinedAt; - } - Long G = guild.G(); - if (G == null) { - G = this.rulesChannelId; - } - Long D = guild.D(); - if (D == null) { - D = this.publicUpdatesChannelId; - } - String z2 = guild.z(); - if (z2 == null) { - z2 = this.preferredLocale; - } - GuildWelcomeScreen R = guild.R(); - if (R == null) { - R = this.welcomeScreen; - } - GuildMaxVideoChannelUsers s2 = guild.s(); + int L = guild.L(); + String s2 = guild.s(); if (s2 == null) { - s2 = this.maxVideoChannelUsers; + s2 = this.joinedAt; } - String O = guild.O(); - if (O == null) { - O = this.vanityUrlCode; + Long H = guild.H(); + if (H == null) { + H = this.rulesChannelId; } - return new Guild(emptyList, k, null, w, i, intValue, q, E, y2, p, P, l, N, v, c2, b, L, set, 0, e, H, B, A, K, r, G, D, z2, R, s2, O, guild.d() != 0 ? guild.d() : this.approximatePresenceCount, guild.x(), 4, 0, null); + Long E = guild.E(); + if (E == null) { + E = this.publicUpdatesChannelId; + } + String A = guild.A(); + if (A == null) { + A = this.preferredLocale; + } + GuildWelcomeScreen S = guild.S(); + if (S == null) { + S = this.welcomeScreen; + } + GuildMaxVideoChannelUsers t = guild.t(); + if (t == null) { + t = this.maxVideoChannelUsers; + } + String P = guild.P(); + if (P == null) { + P = this.vanityUrlCode; + } + return new Guild(emptyList, k, null, x2, i, intValue, r, F, z2, q, Q, l, O, w, c2, b, M, set, 0, e, I, C, B, L, s2, H, E, A, S, t, P, guild.d() != 0 ? guild.d() : this.approximatePresenceCount, guild.y(), guild.p(), 4, 0, null); } public String toString() { @@ -687,6 +700,10 @@ public final class Guild { R.append(", approximatePresenceCount="); R.append(this.approximatePresenceCount); R.append(", nsfw="); - return a.L(R, this.nsfw, ")"); + R.append(this.nsfw); + R.append(", hubType="); + R.append(this.hubType); + R.append(")"); + return R.toString(); } } diff --git a/app/src/main/java/com/discord/restapi/RestAPIInterface.java b/app/src/main/java/com/discord/restapi/RestAPIInterface.java index 74d3f5a0c5..a70d7fdf94 100644 --- a/app/src/main/java/com/discord/restapi/RestAPIInterface.java +++ b/app/src/main/java/com/discord/restapi/RestAPIInterface.java @@ -14,7 +14,8 @@ import com.discord.api.channel.Channel; import com.discord.api.commands.ApplicationCommand; import com.discord.api.commands.ApplicationCommandData; import com.discord.api.connectedaccounts.ConnectedAccount; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryEvent; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.api.fingerprint.FingerprintResponse; import com.discord.api.friendsuggestions.BulkAddFriendsResponse; import com.discord.api.friendsuggestions.BulkFriendSuggestions; @@ -263,7 +264,7 @@ public interface RestAPIInterface { Observable addRelationship(@s("userId") long j, @a RestAPIParams.UserRelationship userRelationship, @i("X-Context-Properties") String str); @i0.f0.o("channels/{channelId}/directory-entry/{guildId}") - Observable> addServerToHub(@s("channelId") long j, @s("guildId") long j2, @a RestAPIParams.AddServerBody addServerBody); + Observable> addServerToHub(@s("channelId") long j, @s("guildId") long j2, @a RestAPIParams.AddServerBody addServerBody); @f("connections/{connection}/authorize") Observable authorizeConnection(@s("connection") String str); @@ -512,7 +513,10 @@ public interface RestAPIInterface { Observable getConsents(); @f("channels/{channelId}/directory-entries") - Observable> getDirectoryEntries(@s("channelId") long j); + Observable> getDirectoryEntries(@s("channelId") long j); + + @f("channels/{channelId}/directory-entries") + Observable> getDirectoryGuildScheduledEvents(@s("channelId") long j, @t("type") int i); @f("emojis/{emojiId}/guild") Observable getEmojiGuild(@s("emojiId") long j); @@ -722,7 +726,7 @@ public interface RestAPIInterface { Observable> logout(@a RestAPIParams.UserDevices userDevices); @n("channels/{channelId}/directory-entry/{guildId}") - Observable modifyServerInHub(@s("channelId") long j, @s("guildId") long j2, @a RestAPIParams.AddServerBody addServerBody); + Observable modifyServerInHub(@s("channelId") long j, @s("guildId") long j2, @a RestAPIParams.AddServerBody addServerBody); @n("guilds/{guildId}/emojis/{emojiId}") Observable patchGuildEmoji(@s("guildId") long j, @s("emojiId") long j2, @a RestAPIParams.PatchGuildEmoji patchGuildEmoji); @@ -803,7 +807,7 @@ public interface RestAPIInterface { Observable removeSelfReaction(@s("channelId") long j, @s("messageId") long j2, @s(encoded = true, value = "reaction") String str); @b("channels/{channelId}/directory-entry/{guildId}") - Observable> removeServerFromHub(@s("channelId") long j, @s("guildId") long j2); + Observable> removeServerFromHub(@s("channelId") long j, @s("guildId") long j2); @n("guilds/{guildId}/channels") Observable reorderChannels(@s("guildId") long j, @a List list); @@ -845,7 +849,7 @@ public interface RestAPIInterface { Observable searchGuildMessages(@s("guildId") long j, @t("max_id") Long l, @t("author_id") List list, @t("mentions") List list2, @t("channel_id") List list3, @t("has") List list4, @t("content") List list5, @t("attempts") Integer num, @t("include_nsfw") Boolean bool); @f("channels/{channelId}/directory-entries/search") - Observable> searchServers(@s("channelId") long j, @t("query") String str); + Observable> searchServers(@s("channelId") long j, @t("query") String str); @i0.f0.o("interactions") @l diff --git a/app/src/main/java/com/discord/stores/ReadyPayloadUtils.java b/app/src/main/java/com/discord/stores/ReadyPayloadUtils.java index 97de2bce35..afa3de4470 100644 --- a/app/src/main/java/com/discord/stores/ReadyPayloadUtils.java +++ b/app/src/main/java/com/discord/stores/ReadyPayloadUtils.java @@ -373,24 +373,24 @@ public final class ReadyPayloadUtils { String i = guild2.i(); GuildExplicitContentFilter l = guild2.l(); List m = guild2.m(); - String p = guild2.p(); - GuildMaxVideoChannelUsers s2 = guild2.s(); - int v = guild2.v(); - String w = guild2.w(); - long y2 = guild2.y(); - String z2 = guild2.z(); - int B = guild2.B(); - Long D = guild2.D(); - String E = guild2.E(); - Long G = guild2.G(); - guild3 = Guild.a(guild, null, null, null, w, i, h, 0, E, y2, p, guild2.P(), l, null, null, null, null, false, v, c2, b, guild2.L(), m, 0, e, guild2.H(), B, 0, guild2.K(), null, G, D, z2, null, s2, guild2.O(), 0, 0, null, null, null, null, false, null, null, null, 339865671, 8185); + String q = guild2.q(); + GuildMaxVideoChannelUsers t = guild2.t(); + int w = guild2.w(); + String x2 = guild2.x(); + long z2 = guild2.z(); + String A = guild2.A(); + int C = guild2.C(); + Long E = guild2.E(); + String F = guild2.F(); + Long H = guild2.H(); + guild3 = Guild.a(guild, null, null, null, x2, i, h, 0, F, z2, q, guild2.Q(), l, null, null, null, null, false, w, c2, b, guild2.M(), m, 0, e, guild2.I(), C, 0, guild2.L(), null, H, E, A, null, t, guild2.P(), 0, 0, null, null, null, null, false, null, null, null, null, 339865671, 16377); } if (list != null) { - guild3 = Guild.a(guild3, null, list, null, null, null, null, 0, null, 0, null, null, null, null, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, -3, 8191); + guild3 = Guild.a(guild3, null, list, null, null, null, null, 0, null, 0, null, null, null, null, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, null, -3, 16383); } Guild guild4 = guild3; if (list2 != null) { - guild4 = Guild.a(guild4, null, null, list2, null, null, null, 0, null, 0, null, null, null, null, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, -5, 8191); + guild4 = Guild.a(guild4, null, null, list2, null, null, null, 0, null, 0, null, null, null, null, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, null, -5, 16383); } Guild guild5 = guild4; if (list3 != null) { @@ -401,7 +401,7 @@ public final class ReadyPayloadUtils { for (Channel channel : f) { hashMap.put(Long.valueOf(channel.h()), channel); } - guild5 = Guild.a(guild5, null, null, null, null, null, null, 0, null, 0, null, null, null, null, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, -1, 8063); + guild5 = Guild.a(guild5, null, null, null, null, null, null, 0, null, 0, null, null, null, null, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, null, -1, 16255); } ArrayList arrayList = new ArrayList(); for (Channel channel2 : list3) { @@ -412,17 +412,17 @@ public final class ReadyPayloadUtils { arrayList.add(channel2); } } - guild5 = Guild.a(guild5, null, null, null, null, null, null, 0, null, 0, null, null, null, null, arrayList, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, -8193, 8191); + guild5 = Guild.a(guild5, null, null, null, null, null, null, 0, null, 0, null, null, null, null, arrayList, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, null, -8193, 16383); } Guild guild6 = guild5; if (list4 != null) { - guild6 = Guild.a(guild6, list4, null, null, null, null, null, 0, null, 0, null, null, null, null, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, -2, 8191); + guild6 = Guild.a(guild6, list4, null, null, null, null, null, 0, null, 0, null, null, null, null, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, null, -2, 16383); } Guild guild7 = guild6; if (list5 != null) { - guild7 = Guild.a(guild7, null, null, null, null, null, null, 0, null, 0, null, null, null, list5, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, -4097, 8191); + guild7 = Guild.a(guild7, null, null, null, null, null, null, 0, null, 0, null, null, null, list5, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, null, -4097, 16383); } - return map != null ? Guild.a(guild7, null, null, null, null, null, null, 0, null, 0, null, null, null, null, null, u.toList(map.values()), null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, -16385, 8191) : guild7; + return map != null ? Guild.a(guild7, null, null, null, null, null, null, 0, null, 0, null, null, null, null, null, u.toList(map.values()), null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, null, null, null, -16385, 16383) : guild7; } /* JADX WARNING: Removed duplicated region for block: B:37:0x00a5 */ @@ -457,10 +457,10 @@ public final class ReadyPayloadUtils { boolean booleanValue = ((Boolean) triple.component1()).booleanValue(); boolean booleanValue2 = ((Boolean) triple.component2()).booleanValue(); boolean booleanValue3 = ((Boolean) triple.component3()).booleanValue(); - if (guild.N()) { + if (guild.O()) { return new HydrateGuildResult.Success(guild); } - GuildCache remove = cache.remove(Long.valueOf(guild.q())); + GuildCache remove = cache.remove(Long.valueOf(guild.r())); if ((booleanValue || booleanValue2 || booleanValue3) && remove == null) { return HydrateGuildResult.Error.INSTANCE; } diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics.java b/app/src/main/java/com/discord/stores/StoreAnalytics.java index 21a9e4b2ad..caa40dbc67 100644 --- a/app/src/main/java/com/discord/stores/StoreAnalytics.java +++ b/app/src/main/java/com/discord/stores/StoreAnalytics.java @@ -672,7 +672,7 @@ public final class StoreAnalytics extends Store { pairArr[0] = o.to(ModelAuditLogEntry.CHANGE_KEY_LOCATION, str); pairArr[1] = o.to("message_id", Long.valueOf(message.o())); Long l = null; - pairArr[2] = o.to("invite_guild_id", (modelInvite == null || (guild = modelInvite.getGuild()) == null) ? null : Long.valueOf(guild.q())); + pairArr[2] = o.to("invite_guild_id", (modelInvite == null || (guild = modelInvite.getGuild()) == null) ? null : Long.valueOf(guild.r())); pairArr[3] = o.to("invite_channel_id", (modelInvite == null || (channel = modelInvite.getChannel()) == null) ? null : Long.valueOf(channel.h())); if (!(modelInvite == null || (guildScheduledEvent = modelInvite.getGuildScheduledEvent()) == null)) { l = Long.valueOf(guildScheduledEvent.h()); diff --git a/app/src/main/java/com/discord/stores/StoreApplicationStreaming.java b/app/src/main/java/com/discord/stores/StoreApplicationStreaming.java index bde1637789..483636b95d 100644 --- a/app/src/main/java/com/discord/stores/StoreApplicationStreaming.java +++ b/app/src/main/java/com/discord/stores/StoreApplicationStreaming.java @@ -339,10 +339,10 @@ public final class StoreApplicationStreaming extends StoreV2 { List guilds = modelPayload.getGuilds(); m.checkNotNullExpressionValue(guilds, "payload.guilds"); for (Guild guild : guilds) { - List Q = guild.Q(); - if (Q != null) { - for (VoiceState voiceState : Q) { - handleVoiceStateUpdate(voiceState, guild.q()); + List R = guild.R(); + if (R != null) { + for (VoiceState voiceState : R) { + handleVoiceStateUpdate(voiceState, guild.r()); } } } diff --git a/app/src/main/java/com/discord/stores/StoreChannels$handleGuildRemove$2.java b/app/src/main/java/com/discord/stores/StoreChannels$handleGuildRemove$2.java index 816c9fc958..f2a96b0b28 100644 --- a/app/src/main/java/com/discord/stores/StoreChannels$handleGuildRemove$2.java +++ b/app/src/main/java/com/discord/stores/StoreChannels$handleGuildRemove$2.java @@ -24,6 +24,6 @@ public final class StoreChannels$handleGuildRemove$2 extends o implements Functi public final boolean invoke(Channel channel) { m.checkNotNullParameter(channel, "thread"); - return channel.f() == this.$guild.q(); + return channel.f() == this.$guild.r(); } } diff --git a/app/src/main/java/com/discord/stores/StoreChannels.java b/app/src/main/java/com/discord/stores/StoreChannels.java index 796a73ec18..df4dd5d63a 100644 --- a/app/src/main/java/com/discord/stores/StoreChannels.java +++ b/app/src/main/java/com/discord/stores/StoreChannels.java @@ -397,7 +397,7 @@ public final class StoreChannels extends StoreV2 { m.checkNotNullExpressionValue(guilds, "payload.guilds"); for (Guild guild : guilds) { Map> map4 = this.channelsByGuild; - Long valueOf2 = Long.valueOf(guild.q()); + Long valueOf2 = Long.valueOf(guild.r()); Map map5 = map4.get(valueOf2); if (map5 == null) { map5 = new HashMap<>(); @@ -407,14 +407,14 @@ public final class StoreChannels extends StoreV2 { List g = guild.g(); if (g != null) { for (Channel channel3 : g) { - map6.put(Long.valueOf(channel3.h()), Channel.a(channel3, null, 0, channel3.f() != 0 ? channel3.f() : guild.q(), null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, null, 536870907)); + map6.put(Long.valueOf(channel3.h()), Channel.a(channel3, null, 0, channel3.f() != 0 ? channel3.f() : guild.r(), null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, null, 536870907)); } } - List M = guild.M(); - if (M != null) { - for (Channel channel4 : M) { + List N = guild.N(); + if (N != null) { + for (Channel channel4 : N) { if (ChannelUtils.C(channel4)) { - storeThread$app_productionCanaryRelease$default(this, channel4, guild.q(), null, 4, null); + storeThread$app_productionCanaryRelease$default(this, channel4, guild.r(), null, 4, null); } } } @@ -509,7 +509,7 @@ public final class StoreChannels extends StoreV2 { public final void handleGuildAdd(Guild guild) { m.checkNotNullParameter(guild, "guild"); Map> map = this.channelsByGuild; - Long valueOf = Long.valueOf(guild.q()); + Long valueOf = Long.valueOf(guild.r()); Map map2 = map.get(valueOf); if (map2 == null) { map2 = new HashMap<>(); @@ -519,15 +519,15 @@ public final class StoreChannels extends StoreV2 { List g = guild.g(); if (g != null) { for (Channel channel : g) { - map3.put(Long.valueOf(channel.h()), Channel.a(channel, null, 0, channel.f() != 0 ? channel.f() : guild.q(), null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, null, 536870907)); + map3.put(Long.valueOf(channel.h()), Channel.a(channel, null, 0, channel.f() != 0 ? channel.f() : guild.r(), null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, null, 536870907)); this.channelNames.put(Long.valueOf(channel.h()), ChannelUtils.c(channel)); } } - List M = guild.M(); - if (M != null) { - for (Channel channel2 : M) { + List N = guild.N(); + if (N != null) { + for (Channel channel2 : N) { if (ChannelUtils.C(channel2)) { - storeThread$app_productionCanaryRelease$default(this, channel2, guild.q(), null, 4, null); + storeThread$app_productionCanaryRelease$default(this, channel2, guild.r(), null, 4, null); } } } @@ -538,15 +538,15 @@ public final class StoreChannels extends StoreV2 { public final void handleGuildRemove(Guild guild) { Set keySet; m.checkNotNullParameter(guild, "guild"); - long q = guild.q(); - if (this.channelsByGuild.containsKey(Long.valueOf(q))) { - Map map = this.channelsByGuild.get(Long.valueOf(q)); + long r = guild.r(); + if (this.channelsByGuild.containsKey(Long.valueOf(r))) { + Map map = this.channelsByGuild.get(Long.valueOf(r)); if (!(map == null || (keySet = map.keySet()) == null)) { for (Number number : keySet) { this.channelNames.remove(Long.valueOf(number.longValue())); } } - this.channelsByGuild.remove(Long.valueOf(guild.q())); + this.channelsByGuild.remove(Long.valueOf(guild.r())); r.removeAll(this.threadsById.values(), new StoreChannels$handleGuildRemove$2(guild)); } markChanged(); diff --git a/app/src/main/java/com/discord/stores/StoreChannelsSelected.java b/app/src/main/java/com/discord/stores/StoreChannelsSelected.java index c04a27a8a0..9edae35b4d 100644 --- a/app/src/main/java/com/discord/stores/StoreChannelsSelected.java +++ b/app/src/main/java/com/discord/stores/StoreChannelsSelected.java @@ -798,7 +798,7 @@ public final class StoreChannelsSelected extends StoreV2 { m.checkNotNullExpressionValue(guilds, "payload.guilds"); HashSet hashSetOf = n0.hashSetOf(0L); for (Guild guild : guilds) { - hashSetOf.add(Long.valueOf(guild.q())); + hashSetOf.add(Long.valueOf(guild.r())); } Map map = this.userChannelSelections; LinkedHashMap linkedHashMap = new LinkedHashMap(); @@ -820,7 +820,7 @@ public final class StoreChannelsSelected extends StoreV2 { @StoreThread public final void handleGuildAdd(Guild guild) { m.checkNotNullParameter(guild, "guild"); - if (this.storeGuildSelected.getSelectedGuildIdInternal$app_productionCanaryRelease() == guild.q()) { + if (this.storeGuildSelected.getSelectedGuildIdInternal$app_productionCanaryRelease() == guild.r()) { validateSelectedChannel(); } } @@ -829,7 +829,7 @@ public final class StoreChannelsSelected extends StoreV2 { public final void handleGuildRemove(Guild guild) { m.checkNotNullParameter(guild, "guild"); Channel maybeChannel = this.selectedChannel.getMaybeChannel(); - if (maybeChannel != null && maybeChannel.f() == guild.q()) { + if (maybeChannel != null && maybeChannel.f() == guild.r()) { validateSelectedChannel(); } } diff --git a/app/src/main/java/com/discord/stores/StoreClientDataState.java b/app/src/main/java/com/discord/stores/StoreClientDataState.java index b2373373fe..afa6eff730 100644 --- a/app/src/main/java/com/discord/stores/StoreClientDataState.java +++ b/app/src/main/java/com/discord/stores/StoreClientDataState.java @@ -207,12 +207,12 @@ public final class StoreClientDataState extends StoreV2 { @StoreThread private final void updateGuildHash(Guild guild) { GuildHashes n; - if (guild.N() || (n = guild.n()) == null || !GuildHashUtilsKt.isSupported(n)) { - this.guildHashes.remove(Long.valueOf(guild.q())); + if (guild.O() || (n = guild.n()) == null || !GuildHashUtilsKt.isSupported(n)) { + this.guildHashes.remove(Long.valueOf(guild.r())); return; } Map map = this.guildHashes; - Long valueOf = Long.valueOf(guild.q()); + Long valueOf = Long.valueOf(guild.r()); GuildHashes n2 = guild.n(); m.checkNotNull(n2); map.put(valueOf, n2); @@ -293,7 +293,7 @@ public final class StoreClientDataState extends StoreV2 { @StoreThread public final void handleGuildRemove(Guild guild) { m.checkNotNullParameter(guild, "guild"); - this.guildHashes.remove(Long.valueOf(guild.q())); + this.guildHashes.remove(Long.valueOf(guild.r())); markChanged(); } diff --git a/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java b/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java index 35553c7f07..55b88e209e 100644 --- a/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java +++ b/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java @@ -96,7 +96,7 @@ public final class StoreCollapsedChannelCategories extends StoreV2 { List guilds = modelPayload.getGuilds(); m.checkNotNullExpressionValue(guilds, "payload.guilds"); for (Guild guild : guilds) { - Set set = this.collapsedCategories.get(Long.valueOf(guild.q())); + Set set = this.collapsedCategories.get(Long.valueOf(guild.r())); if (set != null) { HashSet hashSet2 = new HashSet(set); List g = guild.g(); @@ -106,11 +106,11 @@ public final class StoreCollapsedChannelCategories extends StoreV2 { } } for (Long l : hashSet2) { - long q = guild.q(); + long r = guild.r(); m.checkNotNullExpressionValue(l, "channelId"); - setCollapsedState(q, l.longValue(), false); + setCollapsedState(r, l.longValue(), false); } - hashSet.remove(Long.valueOf(guild.q())); + hashSet.remove(Long.valueOf(guild.r())); } } for (Long l2 : hashSet) { diff --git a/app/src/main/java/com/discord/stores/StoreDirectories$addServerToDirectory$1.java b/app/src/main/java/com/discord/stores/StoreDirectories$addServerToDirectory$1.java index a2755dd296..f4977d8c2f 100644 --- a/app/src/main/java/com/discord/stores/StoreDirectories$addServerToDirectory$1.java +++ b/app/src/main/java/com/discord/stores/StoreDirectories$addServerToDirectory$1.java @@ -1,6 +1,6 @@ package com.discord.stores; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.stores.utilities.RestCallState; import com.discord.stores.utilities.Success; import d0.t.n; @@ -15,15 +15,15 @@ import kotlin.jvm.functions.Function0; /* compiled from: StoreDirectories.kt */ public final class StoreDirectories$addServerToDirectory$1 extends o implements Function0 { public final /* synthetic */ long $channelId; - public final /* synthetic */ DirectoryEntry $directoryEntry; + public final /* synthetic */ DirectoryEntryGuild $directoryEntry; public final /* synthetic */ StoreDirectories this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreDirectories$addServerToDirectory$1(StoreDirectories storeDirectories, long j, DirectoryEntry directoryEntry) { + public StoreDirectories$addServerToDirectory$1(StoreDirectories storeDirectories, long j, DirectoryEntryGuild directoryEntryGuild) { super(0); this.this$0 = storeDirectories; this.$channelId = j; - this.$directoryEntry = directoryEntry; + this.$directoryEntry = directoryEntryGuild; } @Override // kotlin.jvm.functions.Function0 @@ -32,24 +32,24 @@ public final class StoreDirectories$addServerToDirectory$1 extends o implements Map access$getDirectoriesMap$p = StoreDirectories.access$getDirectoriesMap$p(this.this$0); Long valueOf = Long.valueOf(this.$channelId); RestCallState restCallState = (RestCallState) StoreDirectories.access$getDirectoriesMap$p(this.this$0).get(Long.valueOf(this.$channelId)); - DirectoryEntry directoryEntry = null; - List list = restCallState != null ? (List) restCallState.invoke() : null; + DirectoryEntryGuild directoryEntryGuild = null; + List list = restCallState != null ? (List) restCallState.invoke() : null; if (list == null) { list = n.emptyList(); } ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(list, 10)); boolean z2 = false; - for (DirectoryEntry directoryEntry2 : list) { - if (directoryEntry2.e().h() == this.$directoryEntry.e().h()) { + for (DirectoryEntryGuild directoryEntryGuild2 : list) { + if (directoryEntryGuild2.e().h() == this.$directoryEntry.e().h()) { z2 = true; - directoryEntry2 = this.$directoryEntry; + directoryEntryGuild2 = this.$directoryEntry; } - arrayList.add(directoryEntry2); + arrayList.add(directoryEntryGuild2); } if (!z2) { - directoryEntry = this.$directoryEntry; + directoryEntryGuild = this.$directoryEntry; } - access$getDirectoriesMap$p.put(valueOf, new Success(u.plus((Collection) arrayList, (Iterable) n.listOfNotNull(directoryEntry)))); + access$getDirectoriesMap$p.put(valueOf, new Success(u.plus((Collection) arrayList, (Iterable) n.listOfNotNull(directoryEntryGuild)))); this.this$0.markChanged(); } } diff --git a/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$1$$special$$inlined$sortedByDescending$1.java b/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$1$$special$$inlined$sortedByDescending$1.java index 716eea3143..33f0207643 100644 --- a/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$1$$special$$inlined$sortedByDescending$1.java +++ b/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$1$$special$$inlined$sortedByDescending$1.java @@ -6,6 +6,13 @@ import java.util.Comparator; public final class StoreDirectories$fetchDirectoriesForChannel$1$$special$$inlined$sortedByDescending$1 implements Comparator { @Override // java.util.Comparator public final int compare(T t, T t2) { - return a.compareValues(t2.e().a(), t.e().a()); + Integer a = t2.e().a(); + int i = 0; + Integer valueOf = Integer.valueOf(a != null ? a.intValue() : 0); + Integer a2 = t.e().a(); + if (a2 != null) { + i = a2.intValue(); + } + return a.compareValues(valueOf, Integer.valueOf(i)); } } diff --git a/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$1.java b/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$1.java index 7caf5cb330..dd26ebc135 100644 --- a/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$1.java +++ b/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$1.java @@ -1,22 +1,22 @@ package com.discord.stores; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import d0.t.u; import d0.z.d.m; import j0.k.b; import java.util.List; /* compiled from: StoreDirectories.kt */ -public final class StoreDirectories$fetchDirectoriesForChannel$1 implements b, List> { +public final class StoreDirectories$fetchDirectoriesForChannel$1 implements b, List> { public static final StoreDirectories$fetchDirectoriesForChannel$1 INSTANCE = new StoreDirectories$fetchDirectoriesForChannel$1(); /* Return type fixed from 'java.lang.Object' to match base method */ /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ @Override // j0.k.b - public /* bridge */ /* synthetic */ List call(List list) { - return call((List) list); + public /* bridge */ /* synthetic */ List call(List list) { + return call((List) list); } - public final List call(List list) { + public final List call(List list) { m.checkNotNullExpressionValue(list, "entries"); return u.sortedWith(list, new StoreDirectories$fetchDirectoriesForChannel$1$$special$$inlined$sortedByDescending$1()); } diff --git a/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$2.java b/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$2.java index 04e7dae0e5..400d9a9e37 100644 --- a/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$2.java +++ b/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$2.java @@ -1,6 +1,6 @@ package com.discord.stores; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.stores.utilities.RestCallState; import d0.z.d.m; import d0.z.d.o; @@ -9,7 +9,7 @@ import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; /* compiled from: StoreDirectories.kt */ -public final class StoreDirectories$fetchDirectoriesForChannel$2 extends o implements Function1>, Unit> { +public final class StoreDirectories$fetchDirectoriesForChannel$2 extends o implements Function1>, Unit> { public final /* synthetic */ long $channelId; public final /* synthetic */ StoreDirectories this$0; @@ -44,12 +44,12 @@ public final class StoreDirectories$fetchDirectoriesForChannel$2 extends o imple /* Return type fixed from 'java.lang.Object' to match base method */ /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(RestCallState> restCallState) { - invoke((RestCallState>) restCallState); + public /* bridge */ /* synthetic */ Unit invoke(RestCallState> restCallState) { + invoke((RestCallState>) restCallState); return Unit.a; } - public final void invoke(RestCallState> restCallState) { + public final void invoke(RestCallState> restCallState) { m.checkNotNullParameter(restCallState, "entriesResponse"); StoreDirectories.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, restCallState)); } diff --git a/app/src/main/java/com/discord/stores/StoreDirectories$fetchGuildScheduledEventsForChannel$1.java b/app/src/main/java/com/discord/stores/StoreDirectories$fetchGuildScheduledEventsForChannel$1.java new file mode 100644 index 0000000000..e80a42e899 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreDirectories$fetchGuildScheduledEventsForChannel$1.java @@ -0,0 +1,56 @@ +package com.discord.stores; + +import com.discord.api.directory.DirectoryEntryEvent; +import com.discord.stores.utilities.RestCallState; +import d0.z.d.m; +import d0.z.d.o; +import java.util.List; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; +/* compiled from: StoreDirectories.kt */ +public final class StoreDirectories$fetchGuildScheduledEventsForChannel$1 extends o implements Function1>, Unit> { + public final /* synthetic */ long $channelId; + public final /* synthetic */ StoreDirectories this$0; + + /* compiled from: StoreDirectories.kt */ + /* renamed from: com.discord.stores.StoreDirectories$fetchGuildScheduledEventsForChannel$1$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function0 { + public final /* synthetic */ RestCallState $response; + public final /* synthetic */ StoreDirectories$fetchGuildScheduledEventsForChannel$1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(StoreDirectories$fetchGuildScheduledEventsForChannel$1 storeDirectories$fetchGuildScheduledEventsForChannel$1, RestCallState restCallState) { + super(0); + this.this$0 = storeDirectories$fetchGuildScheduledEventsForChannel$1; + this.$response = restCallState; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreDirectories.access$getDirectoryGuildScheduledEventsMap$p(this.this$0.this$0).put(Long.valueOf(this.this$0.$channelId), this.$response); + this.this$0.this$0.markChanged(); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreDirectories$fetchGuildScheduledEventsForChannel$1(StoreDirectories storeDirectories, long j) { + super(1); + this.this$0 = storeDirectories; + this.$channelId = j; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(RestCallState> restCallState) { + invoke((RestCallState>) restCallState); + return Unit.a; + } + + public final void invoke(RestCallState> restCallState) { + m.checkNotNullParameter(restCallState, "response"); + StoreDirectories.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, restCallState)); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectories$1.java b/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectories$1.java index 0f2773a36a..6e1221a13a 100644 --- a/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectories$1.java +++ b/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectories$1.java @@ -1,13 +1,13 @@ package com.discord.stores; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.stores.utilities.RestCallState; import d0.z.d.o; import java.util.List; import java.util.Map; import kotlin.jvm.functions.Function0; /* compiled from: StoreDirectories.kt */ -public final class StoreDirectories$observeDirectories$1 extends o implements Function0>>> { +public final class StoreDirectories$observeDirectories$1 extends o implements Function0>>> { public final /* synthetic */ StoreDirectories this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -16,10 +16,10 @@ public final class StoreDirectories$observeDirectories$1 extends o implements Fu this.this$0 = storeDirectories; } - /* Return type fixed from 'java.util.Map>>' to match base method */ + /* Return type fixed from 'java.util.Map>>' to match base method */ @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ - public final Map>> mo1invoke() { + public final Map>> mo1invoke() { return StoreDirectories.access$getDirectoriesMapSnapshot$p(this.this$0); } } diff --git a/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectoriesForChannel$1.java b/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectoriesForChannel$1.java index e6ba11d15e..16dffb1685 100644 --- a/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectoriesForChannel$1.java +++ b/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectoriesForChannel$1.java @@ -1,12 +1,12 @@ package com.discord.stores; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.stores.utilities.RestCallState; import d0.z.d.o; import java.util.List; import kotlin.jvm.functions.Function0; /* compiled from: StoreDirectories.kt */ -public final class StoreDirectories$observeDirectoriesForChannel$1 extends o implements Function0>> { +public final class StoreDirectories$observeDirectoriesForChannel$1 extends o implements Function0>> { public final /* synthetic */ long $channelId; public final /* synthetic */ StoreDirectories this$0; @@ -17,10 +17,10 @@ public final class StoreDirectories$observeDirectoriesForChannel$1 extends o imp this.$channelId = j; } - /* Return type fixed from 'com.discord.stores.utilities.RestCallState>' to match base method */ + /* Return type fixed from 'com.discord.stores.utilities.RestCallState>' to match base method */ @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ - public final RestCallState> mo1invoke() { + public final RestCallState> mo1invoke() { return (RestCallState) StoreDirectories.access$getDirectoriesMapSnapshot$p(this.this$0).get(Long.valueOf(this.$channelId)); } } diff --git a/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectoryGuildScheduledEvents$1.java b/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectoryGuildScheduledEvents$1.java new file mode 100644 index 0000000000..acca30270c --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectoryGuildScheduledEvents$1.java @@ -0,0 +1,25 @@ +package com.discord.stores; + +import com.discord.api.directory.DirectoryEntryEvent; +import com.discord.stores.utilities.RestCallState; +import d0.z.d.o; +import java.util.List; +import java.util.Map; +import kotlin.jvm.functions.Function0; +/* compiled from: StoreDirectories.kt */ +public final class StoreDirectories$observeDirectoryGuildScheduledEvents$1 extends o implements Function0>>> { + public final /* synthetic */ StoreDirectories this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreDirectories$observeDirectoryGuildScheduledEvents$1(StoreDirectories storeDirectories) { + super(0); + this.this$0 = storeDirectories; + } + + /* Return type fixed from 'java.util.Map>>' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final Map>> mo1invoke() { + return StoreDirectories.access$getDirectoryGuildScheduledEventsMapSnapshot$p(this.this$0); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreDirectories$removeServerFromDirectory$1.java b/app/src/main/java/com/discord/stores/StoreDirectories$removeServerFromDirectory$1.java index e20045d820..bbf8d009cd 100644 --- a/app/src/main/java/com/discord/stores/StoreDirectories$removeServerFromDirectory$1.java +++ b/app/src/main/java/com/discord/stores/StoreDirectories$removeServerFromDirectory$1.java @@ -2,11 +2,11 @@ package com.discord.stores; import com.discord.analytics.generated.events.network_action.TrackNetworkActionDirectoryGuildEntryDelete; import com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import d0.z.d.o; import kotlin.jvm.functions.Function1; /* compiled from: StoreDirectories.kt */ -public final class StoreDirectories$removeServerFromDirectory$1 extends o implements Function1 { +public final class StoreDirectories$removeServerFromDirectory$1 extends o implements Function1 { public final /* synthetic */ long $channelId; public final /* synthetic */ long $guildId; @@ -17,7 +17,7 @@ public final class StoreDirectories$removeServerFromDirectory$1 extends o implem this.$guildId = j2; } - public final TrackNetworkMetadataReceiver invoke(DirectoryEntry directoryEntry) { + public final TrackNetworkMetadataReceiver invoke(DirectoryEntryGuild directoryEntryGuild) { return new TrackNetworkActionDirectoryGuildEntryDelete(Long.valueOf(this.$channelId), Long.valueOf(this.$guildId)); } } diff --git a/app/src/main/java/com/discord/stores/StoreDirectories$removeServerFromDirectory$2.java b/app/src/main/java/com/discord/stores/StoreDirectories$removeServerFromDirectory$2.java index 3d84a6503a..2c3e32c2e6 100644 --- a/app/src/main/java/com/discord/stores/StoreDirectories$removeServerFromDirectory$2.java +++ b/app/src/main/java/com/discord/stores/StoreDirectories$removeServerFromDirectory$2.java @@ -1,6 +1,7 @@ package com.discord.stores; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; +import com.discord.api.guild.preview.GuildPreview; import com.discord.stores.utilities.RestCallState; import com.discord.stores.utilities.Success; import d0.t.n; @@ -13,7 +14,7 @@ import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; /* compiled from: StoreDirectories.kt */ -public final class StoreDirectories$removeServerFromDirectory$2 extends o implements Function1, Unit> { +public final class StoreDirectories$removeServerFromDirectory$2 extends o implements Function1, Unit> { public final /* synthetic */ long $channelId; public final /* synthetic */ long $guildId; public final /* synthetic */ StoreDirectories this$0; @@ -41,7 +42,8 @@ public final class StoreDirectories$removeServerFromDirectory$2 extends o implem } ArrayList arrayList = new ArrayList(); for (Object obj : list) { - if (((DirectoryEntry) obj).e().h() != this.this$0.$guildId) { + GuildPreview e = ((DirectoryEntryGuild) obj).e(); + if (e == null || e.h() != this.this$0.$guildId) { arrayList.add(obj); } } @@ -61,12 +63,12 @@ public final class StoreDirectories$removeServerFromDirectory$2 extends o implem /* Return type fixed from 'java.lang.Object' to match base method */ /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(RestCallState restCallState) { - invoke((RestCallState) restCallState); + public /* bridge */ /* synthetic */ Unit invoke(RestCallState restCallState) { + invoke((RestCallState) restCallState); return Unit.a; } - public final void invoke(RestCallState restCallState) { + public final void invoke(RestCallState restCallState) { m.checkNotNullParameter(restCallState, "request"); if (restCallState instanceof Success) { StoreDirectories.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this)); diff --git a/app/src/main/java/com/discord/stores/StoreDirectories.java b/app/src/main/java/com/discord/stores/StoreDirectories.java index e6d0aeb8d4..6b3e446650 100644 --- a/app/src/main/java/com/discord/stores/StoreDirectories.java +++ b/app/src/main/java/com/discord/stores/StoreDirectories.java @@ -1,7 +1,9 @@ package com.discord.stores; import android.content.Context; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryEvent; +import com.discord.api.directory.DirectoryEntryGuild; +import com.discord.api.directory.DirectoryEntryType; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.utilities.RestCallState; import com.discord.stores.utilities.RestCallStateKt; @@ -27,8 +29,10 @@ public final class StoreDirectories extends StoreV2 { public static final Companion Companion = new Companion(null); private static final String DISCORD_HUB_VERIFICATION_CLICKED_KEY = "hub_verification_clicked_key"; private static final String HUB_NAME_PROMPT = "hub_name_prompt"; - private Map>> directoriesMap; - private Map>> directoriesMapSnapshot; + private Map>> directoriesMap; + private Map>> directoriesMapSnapshot; + private Map>> directoryGuildScheduledEventsMap; + private Map>> directoryGuildScheduledEventsMapSnapshot; private final Persister discordHubClickedPersister; private final Dispatcher dispatcher; private Map>> entryCountMap; @@ -61,6 +65,8 @@ public final class StoreDirectories extends StoreV2 { this.directoriesMap = new LinkedHashMap(); this.entryCountMapSnapshot = h0.emptyMap(); this.entryCountMap = new LinkedHashMap(); + this.directoryGuildScheduledEventsMapSnapshot = h0.emptyMap(); + this.directoryGuildScheduledEventsMap = new LinkedHashMap(); this.discordHubClickedPersister = new Persister<>(DISCORD_HUB_VERIFICATION_CLICKED_KEY, Boolean.FALSE); this.hubNamePromptPersister = new Persister<>(HUB_NAME_PROMPT, n0.emptySet()); } @@ -78,6 +84,14 @@ public final class StoreDirectories extends StoreV2 { return storeDirectories.directoriesMapSnapshot; } + public static final /* synthetic */ Map access$getDirectoryGuildScheduledEventsMap$p(StoreDirectories storeDirectories) { + return storeDirectories.directoryGuildScheduledEventsMap; + } + + public static final /* synthetic */ Map access$getDirectoryGuildScheduledEventsMapSnapshot$p(StoreDirectories storeDirectories) { + return storeDirectories.directoryGuildScheduledEventsMapSnapshot; + } + public static final /* synthetic */ Dispatcher access$getDispatcher$p(StoreDirectories storeDirectories) { return storeDirectories.dispatcher; } @@ -98,18 +112,26 @@ public final class StoreDirectories extends StoreV2 { storeDirectories.directoriesMapSnapshot = map; } + public static final /* synthetic */ void access$setDirectoryGuildScheduledEventsMap$p(StoreDirectories storeDirectories, Map map) { + storeDirectories.directoryGuildScheduledEventsMap = map; + } + + public static final /* synthetic */ void access$setDirectoryGuildScheduledEventsMapSnapshot$p(StoreDirectories storeDirectories, Map map) { + storeDirectories.directoryGuildScheduledEventsMapSnapshot = map; + } + public static final /* synthetic */ void access$setEntryCountMap$p(StoreDirectories storeDirectories, Map map) { storeDirectories.entryCountMap = map; } - public final void addServerToDirectory(long j, DirectoryEntry directoryEntry) { - m.checkNotNullParameter(directoryEntry, "directoryEntry"); - this.dispatcher.schedule(new StoreDirectories$addServerToDirectory$1(this, j, directoryEntry)); + public final void addServerToDirectory(long j, DirectoryEntryGuild directoryEntryGuild) { + m.checkNotNullParameter(directoryEntryGuild, "directoryEntry"); + this.dispatcher.schedule(new StoreDirectories$addServerToDirectory$1(this, j, directoryEntryGuild)); } public final void fetchDirectoriesForChannel(long j) { Observable F = this.restApi.getDirectoryEntries(j).F(StoreDirectories$fetchDirectoriesForChannel$1.INSTANCE); - m.checkNotNullExpressionValue(F, "restApi\n .getDire…pproximateMemberCount } }"); + m.checkNotNullExpressionValue(F, "restApi\n .getDire…imateMemberCount ?: 0 } }"); RestCallStateKt.executeRequest(F, new StoreDirectories$fetchDirectoriesForChannel$2(this, j)); } @@ -117,6 +139,10 @@ public final class StoreDirectories extends StoreV2 { RestCallStateKt.executeRequest(this.restApi.getEntryCounts(j), new StoreDirectories$fetchEntryCountsForChannel$1(this, j)); } + public final void fetchGuildScheduledEventsForChannel(long j) { + RestCallStateKt.executeRequest(this.restApi.getDirectoryGuildScheduledEvents(j, DirectoryEntryType.GuildScheduledEvent.getKey()), new StoreDirectories$fetchGuildScheduledEventsForChannel$1(this, j)); + } + public final boolean getAndSetSeenNamePrompt(long j) { boolean contains = this.hubNamePromptPersister.get().contains(Long.valueOf(j)); Persister> persister = this.hubNamePromptPersister; @@ -124,7 +150,7 @@ public final class StoreDirectories extends StoreV2 { return contains; } - public final RestCallState> getDirectoriesForChannel(long j) { + public final RestCallState> getDirectoriesForChannel(long j) { return (RestCallState) this.directoriesMapSnapshot.get(Long.valueOf(j)); } @@ -145,14 +171,18 @@ public final class StoreDirectories extends StoreV2 { Persister.set$default(this.discordHubClickedPersister, Boolean.TRUE, false, 2, null); } - public final Observable>>> observeDirectories() { + public final Observable>>> observeDirectories() { return ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreDirectories$observeDirectories$1(this), 14, null); } - public final Observable>> observeDirectoriesForChannel(long j) { + public final Observable>> observeDirectoriesForChannel(long j) { return ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreDirectories$observeDirectoriesForChannel$1(this, j), 14, null); } + public final Observable>>> observeDirectoryGuildScheduledEvents() { + return ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreDirectories$observeDirectoryGuildScheduledEvents$1(this), 14, null); + } + public final Observable observeDiscordHubClicked() { Observable q = this.discordHubClickedPersister.getObservable().q(); m.checkNotNullExpressionValue(q, "discordHubClickedPersist… .distinctUntilChanged()"); diff --git a/app/src/main/java/com/discord/stores/StoreEmbeddedActivities.java b/app/src/main/java/com/discord/stores/StoreEmbeddedActivities.java index 98e1f2ba0f..6e2ccbc564 100644 --- a/app/src/main/java/com/discord/stores/StoreEmbeddedActivities.java +++ b/app/src/main/java/com/discord/stores/StoreEmbeddedActivities.java @@ -53,7 +53,7 @@ public final class StoreEmbeddedActivities extends StoreV2 { j = n.emptyList(); } for (EmbeddedActivityInGuild embeddedActivityInGuild : j) { - handleEmbeddedActivityForChannel(embeddedActivityInGuild.a(), embeddedActivityInGuild.c(), embeddedActivityInGuild.b(), guild.q()); + handleEmbeddedActivityForChannel(embeddedActivityInGuild.a(), embeddedActivityInGuild.c(), embeddedActivityInGuild.b(), guild.r()); } } diff --git a/app/src/main/java/com/discord/stores/StoreEmojiCustom.java b/app/src/main/java/com/discord/stores/StoreEmojiCustom.java index 2d1359c93f..9839353cfe 100644 --- a/app/src/main/java/com/discord/stores/StoreEmojiCustom.java +++ b/app/src/main/java/com/discord/stores/StoreEmojiCustom.java @@ -155,11 +155,11 @@ public final class StoreEmojiCustom extends StoreV2 { Collection collection; boolean z2; m.checkNotNullParameter(guild, "guild"); - List u = guild.u(); - if (u == null) { + List v = guild.v(); + if (v == null) { return null; } - Iterator it = u.iterator(); + Iterator it = v.iterator(); while (true) { if (!it.hasNext()) { obj = null; @@ -181,18 +181,18 @@ public final class StoreEmojiCustom extends StoreV2 { if (guildMember == null) { return null; } - long q = guild.q(); + long r = guild.r(); List k = guild.k(); if (k != null) { collection = new ArrayList<>(o.collectionSizeOrDefault(k, 10)); for (GuildEmoji guildEmoji : k) { - collection.add(new ModelEmojiCustom(guildEmoji, q)); + collection.add(new ModelEmojiCustom(guildEmoji, r)); } } else { collection = n.emptyList(); } - updateGlobalEmojis(q, collection); - updateAllowedGuildEmojis(q, guildMember.l(), collection); + updateGlobalEmojis(r, collection); + updateAllowedGuildEmojis(r, guildMember.l(), collection); return Unit.a; } @@ -212,13 +212,13 @@ public final class StoreEmojiCustom extends StoreV2 { @StoreThread public final void handleGuildRemove(Guild guild) { m.checkNotNullParameter(guild, "guild"); - long q = guild.q(); - if (this.allowedGuildEmojis.containsKey(Long.valueOf(q))) { - this.allowedGuildEmojis.remove(Long.valueOf(q)); + long r = guild.r(); + if (this.allowedGuildEmojis.containsKey(Long.valueOf(r))) { + this.allowedGuildEmojis.remove(Long.valueOf(r)); markChanged(); } - if (this.allGuildEmoji.containsKey(Long.valueOf(q))) { - this.allGuildEmoji.remove(Long.valueOf(q)); + if (this.allGuildEmoji.containsKey(Long.valueOf(r))) { + this.allGuildEmoji.remove(Long.valueOf(r)); markChanged(); } } diff --git a/app/src/main/java/com/discord/stores/StoreGameParty.java b/app/src/main/java/com/discord/stores/StoreGameParty.java index 50fbc104ed..40e4a91c96 100644 --- a/app/src/main/java/com/discord/stores/StoreGameParty.java +++ b/app/src/main/java/com/discord/stores/StoreGameParty.java @@ -190,9 +190,9 @@ public final class StoreGameParty extends StoreV2 { @StoreThread public final void handleGuildCreateOrSync(Guild guild) { m.checkNotNullParameter(guild, "guild"); - List C = guild.C(); - if (C != null) { - handlePresences(C); + List D = guild.D(); + if (D != null) { + handlePresences(D); } } diff --git a/app/src/main/java/com/discord/stores/StoreGatewayConnection.java b/app/src/main/java/com/discord/stores/StoreGatewayConnection.java index f4517306c6..65c4d27829 100644 --- a/app/src/main/java/com/discord/stores/StoreGatewayConnection.java +++ b/app/src/main/java/com/discord/stores/StoreGatewayConnection.java @@ -84,10 +84,12 @@ import d0.z.d.m; import j0.l.c.c; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicReference; +import javax.net.ssl.SSLSocketFactory; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; @@ -466,9 +468,11 @@ public final class StoreGatewayConnection implements GatewayEventHandler { private final GatewaySocket buildGatewaySocket(Context context, NetworkMonitor networkMonitor) { RestAPI.Companion companion = RestAPI.Companion; List listOf = n.listOf((Object[]) new Interceptor[]{companion.buildAnalyticsInterceptor(), companion.buildLoggingInterceptor()}); - App.a aVar = App.k; - boolean z2 = App.j; - GatewaySocket gatewaySocket = new GatewaySocket(new StoreGatewayConnection$buildGatewaySocket$socket$1(this), StoreGatewayConnection$buildGatewaySocket$socket$2.INSTANCE, this, this.scheduler, AppLog.g, networkMonitor, new RestConfig(BuildConfig.HOST_API, RestAPI.AppHeadersProvider.INSTANCE, listOf), context, z2 ? StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.INSTANCE : null, z2 ? null : SecureSocketsLayerUtils.createSocketFactory$default(null, 1, null), AnalyticSuperProperties.INSTANCE.getSuperProperties(), this.gatewaySocketLogger); + App.a aVar = App.Companion; + Objects.requireNonNull(aVar); + SSLSocketFactory createSocketFactory$default = App.access$getIS_LOCAL$cp() ? null : SecureSocketsLayerUtils.createSocketFactory$default(null, 1, null); + Objects.requireNonNull(aVar); + GatewaySocket gatewaySocket = new GatewaySocket(new StoreGatewayConnection$buildGatewaySocket$socket$1(this), StoreGatewayConnection$buildGatewaySocket$socket$2.INSTANCE, this, this.scheduler, AppLog.g, networkMonitor, new RestConfig(BuildConfig.HOST_API, RestAPI.AppHeadersProvider.INSTANCE, listOf), context, App.access$getIS_LOCAL$cp() ? StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.INSTANCE : null, createSocketFactory$default, AnalyticSuperProperties.INSTANCE.getSuperProperties(), this.gatewaySocketLogger); this.stream.getConnectionTimeStats$app_productionCanaryRelease().addListener(gatewaySocket); return gatewaySocket; } diff --git a/app/src/main/java/com/discord/stores/StoreGuildJoinRequest$fetchPendingGuilds$1.java b/app/src/main/java/com/discord/stores/StoreGuildJoinRequest$fetchPendingGuilds$1.java index 5da4d53356..1e78d191b7 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildJoinRequest$fetchPendingGuilds$1.java +++ b/app/src/main/java/com/discord/stores/StoreGuildJoinRequest$fetchPendingGuilds$1.java @@ -40,7 +40,7 @@ public final class StoreGuildJoinRequest$fetchPendingGuilds$1 extends o implemen /* renamed from: invoke */ public final void mo1invoke() { for (Guild guild : this.$results) { - StoreGuildJoinRequest.access$getPendingGuilds$p(this.this$0.this$0.this$0).put(Long.valueOf(guild.q()), new com.discord.models.guild.Guild(guild)); + StoreGuildJoinRequest.access$getPendingGuilds$p(this.this$0.this$0.this$0).put(Long.valueOf(guild.r()), new com.discord.models.guild.Guild(guild)); } this.this$0.this$0.this$0.markChanged(); } diff --git a/app/src/main/java/com/discord/stores/StoreGuildMemberCounts.java b/app/src/main/java/com/discord/stores/StoreGuildMemberCounts.java index db80ab44e4..3451124ffa 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildMemberCounts.java +++ b/app/src/main/java/com/discord/stores/StoreGuildMemberCounts.java @@ -40,7 +40,7 @@ public final class StoreGuildMemberCounts extends StoreV2 { List guilds = modelPayload.getGuilds(); if (guilds != null) { for (Guild guild : guilds) { - this.guildMemberCounts.put(Long.valueOf(guild.q()), Integer.valueOf(guild.t())); + this.guildMemberCounts.put(Long.valueOf(guild.r()), Integer.valueOf(guild.u())); } } markChanged(); @@ -49,7 +49,7 @@ public final class StoreGuildMemberCounts extends StoreV2 { @StoreThread public final void handleGuildCreate(Guild guild) { m.checkNotNullParameter(guild, "guild"); - this.guildMemberCounts.put(Long.valueOf(guild.q()), Integer.valueOf(guild.t())); + this.guildMemberCounts.put(Long.valueOf(guild.r()), Integer.valueOf(guild.u())); markChanged(); } diff --git a/app/src/main/java/com/discord/stores/StoreGuildSelected$handleConnectionOpen$1.java b/app/src/main/java/com/discord/stores/StoreGuildSelected$handleConnectionOpen$1.java index 44dc42bd97..123cfba3f2 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildSelected$handleConnectionOpen$1.java +++ b/app/src/main/java/com/discord/stores/StoreGuildSelected$handleConnectionOpen$1.java @@ -38,7 +38,7 @@ public final class StoreGuildSelected$handleConnectionOpen$1 extends o implement if (!it.hasNext()) { break; } - if (j == ((Guild) it.next()).q()) { + if (j == ((Guild) it.next()).r()) { z3 = true; continue; } else { diff --git a/app/src/main/java/com/discord/stores/StoreGuildSelected.java b/app/src/main/java/com/discord/stores/StoreGuildSelected.java index 08e331ed09..ec4a5c6487 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildSelected.java +++ b/app/src/main/java/com/discord/stores/StoreGuildSelected.java @@ -104,7 +104,7 @@ public final class StoreGuildSelected extends StoreV2 { @StoreThread public final void handleGuildRemove(Guild guild) { m.checkNotNullParameter(guild, "guild"); - if (this.selectedGuildIds.remove(Long.valueOf(guild.q()))) { + if (this.selectedGuildIds.remove(Long.valueOf(guild.r()))) { markChanged(); } } diff --git a/app/src/main/java/com/discord/stores/StoreGuildStickers.java b/app/src/main/java/com/discord/stores/StoreGuildStickers.java index 4d248591ce..e9960553ee 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildStickers.java +++ b/app/src/main/java/com/discord/stores/StoreGuildStickers.java @@ -150,11 +150,11 @@ public final class StoreGuildStickers extends StoreV2 { Object obj; boolean z2; m.checkNotNullParameter(guild, "guild"); - List u = guild.u(); - if (u == null) { + List v = guild.v(); + if (v == null) { return null; } - Iterator it = u.iterator(); + Iterator it = v.iterator(); while (true) { if (!it.hasNext()) { obj = null; @@ -175,12 +175,12 @@ public final class StoreGuildStickers extends StoreV2 { if (((GuildMember) obj) == null) { return null; } - long q = guild.q(); - List J = guild.J(); - if (J == null) { - J = n.emptyList(); + long r = guild.r(); + List K = guild.K(); + if (K == null) { + K = n.emptyList(); } - updateStickers(q, J); + updateStickers(r, K); return Unit.a; } diff --git a/app/src/main/java/com/discord/stores/StoreGuilds.java b/app/src/main/java/com/discord/stores/StoreGuilds.java index 17dbe80fc5..2be93161c2 100644 --- a/app/src/main/java/com/discord/stores/StoreGuilds.java +++ b/app/src/main/java/com/discord/stores/StoreGuilds.java @@ -136,19 +136,19 @@ public final class StoreGuilds extends StoreV2 { @StoreThread private final void handleGuild(com.discord.api.guild.Guild guild, boolean z2) { - long q = guild.q(); + long r = guild.r(); if (!z2) { - Guild guild2 = this.guilds.get(Long.valueOf(q)); + Guild guild2 = this.guilds.get(Long.valueOf(r)); if (guild2 == null) { - guild2 = new Guild(null, null, null, null, null, 0, 0, null, 0, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, false, -1, 1, null); + guild2 = new Guild(null, null, null, null, null, 0, 0, null, 0, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, false, null, -1, 3, null); } Guild merge = guild2.merge(guild); - if (!m.areEqual(merge, this.guilds.get(Long.valueOf(q)))) { - this.guilds.put(Long.valueOf(q), merge); + if (!m.areEqual(merge, this.guilds.get(Long.valueOf(r)))) { + this.guilds.put(Long.valueOf(r), merge); markChanged(GuildsUpdate); } - } else if (this.guilds.containsKey(Long.valueOf(q))) { - this.guilds.remove(Long.valueOf(q)); + } else if (this.guilds.containsKey(Long.valueOf(r))) { + this.guilds.remove(Long.valueOf(r)); markChanged(GuildsUpdate); } } @@ -324,19 +324,19 @@ public final class StoreGuilds extends StoreV2 { this.guildRoles.clear(); this.guildsUnavailable.clear(); for (com.discord.api.guild.Guild guild : modelPayload.getGuilds()) { - long q = guild.q(); - if (guild.N()) { - this.guildsUnavailable.add(Long.valueOf(q)); + long r = guild.r(); + if (guild.O()) { + this.guildsUnavailable.add(Long.valueOf(r)); } else { - handleGuildRoles(q, 0, guild.F(), false); + handleGuildRoles(r, 0, guild.G(), false); m.checkNotNullExpressionValue(guild, "guild"); handleGuild(guild, false); - List u = guild.u(); - if (u == null || (map = GuildUtilsKt.asMap(u)) == null) { + List v = guild.v(); + if (v == null || (map = GuildUtilsKt.asMap(v)) == null) { map = h0.emptyMap(); } - handleGuildMembersMap(q, map); - handleHasRoleAndJoinedAt(q, map); + handleGuildMembersMap(r, map); + handleHasRoleAndJoinedAt(r, map); } } markChanged(GuildsUpdate, ComputedMembersUpdate); @@ -346,16 +346,16 @@ public final class StoreGuilds extends StoreV2 { public final void handleGuildAdd(com.discord.api.guild.Guild guild) { Map map; m.checkNotNullParameter(guild, "guild"); - handleGuildUnavailable(guild.q(), guild.N(), false); - if (!guild.N()) { - handleGuildRoles(guild.q(), 0, guild.F(), false); + handleGuildUnavailable(guild.r(), guild.O(), false); + if (!guild.O()) { + handleGuildRoles(guild.r(), 0, guild.G(), false); handleGuild(guild, false); - List u = guild.u(); - if (u == null || (map = GuildUtilsKt.asMap(u)) == null) { + List v = guild.v(); + if (v == null || (map = GuildUtilsKt.asMap(v)) == null) { map = h0.emptyMap(); } - handleGuildMembersMap(guild.q(), map); - handleHasRoleAndJoinedAt(guild.q(), map); + handleGuildMembersMap(guild.r(), map); + handleHasRoleAndJoinedAt(guild.r(), map); } } @@ -412,10 +412,10 @@ public final class StoreGuilds extends StoreV2 { @StoreThread public final void handleGuildRemove(com.discord.api.guild.Guild guild) { m.checkNotNullParameter(guild, "guild"); - handleGuildUnavailable(guild.q(), guild.N(), true); + handleGuildUnavailable(guild.r(), guild.O(), true); handleGuild(guild, true); - handleGuildRoles(guild.q(), 0, null, true); - handleGuildMembers(guild.q(), 0, null, true); + handleGuildRoles(guild.r(), 0, null, true); + handleGuildMembers(guild.r(), 0, null, true); } @StoreThread diff --git a/app/src/main/java/com/discord/stores/StoreInstantInvites$fetchInviteIfNotLoaded$1.java b/app/src/main/java/com/discord/stores/StoreInstantInvites$fetchInviteIfNotLoaded$1.java index f71124e295..1849b39735 100644 --- a/app/src/main/java/com/discord/stores/StoreInstantInvites$fetchInviteIfNotLoaded$1.java +++ b/app/src/main/java/com/discord/stores/StoreInstantInvites$fetchInviteIfNotLoaded$1.java @@ -46,7 +46,7 @@ public final class StoreInstantInvites$fetchInviteIfNotLoaded$1 extends o implem Channel channel2; Guild guild; StoreInstantInvites$fetchInviteIfNotLoaded$1 storeInstantInvites$fetchInviteIfNotLoaded$1 = this.this$0; - return new TrackNetworkActionInviteResolve(storeInstantInvites$fetchInviteIfNotLoaded$1.$inviteResolved, storeInstantInvites$fetchInviteIfNotLoaded$1.$inviteCode, Boolean.valueOf(StoreStream.Companion.getAuthentication().isAuthed()), (modelInvite == null || (guild = modelInvite.getGuild()) == null) ? null : Long.valueOf(guild.q()), (modelInvite == null || (channel2 = modelInvite.getChannel()) == null) ? null : Long.valueOf(channel2.h()), (modelInvite == null || (channel = modelInvite.getChannel()) == null) ? null : Long.valueOf((long) channel.A()), (modelInvite == null || (inviter = modelInvite.getInviter()) == null) ? null : Long.valueOf(inviter.i()), modelInvite != null ? Long.valueOf((long) modelInvite.getApproximateMemberCount()) : null, modelInvite != null ? Long.valueOf((long) modelInvite.getApproximatePresenceCount()) : null, modelInvite != null ? modelInvite.getInviteType() : null, null, modelInvite != null ? Boolean.valueOf(m.areEqual(modelInvite.code, String.valueOf((int) RestAPIAbortCodes.USER_BANNED))) : null, null); + return new TrackNetworkActionInviteResolve(storeInstantInvites$fetchInviteIfNotLoaded$1.$inviteResolved, storeInstantInvites$fetchInviteIfNotLoaded$1.$inviteCode, Boolean.valueOf(StoreStream.Companion.getAuthentication().isAuthed()), (modelInvite == null || (guild = modelInvite.getGuild()) == null) ? null : Long.valueOf(guild.r()), (modelInvite == null || (channel2 = modelInvite.getChannel()) == null) ? null : Long.valueOf(channel2.h()), (modelInvite == null || (channel = modelInvite.getChannel()) == null) ? null : Long.valueOf((long) channel.A()), (modelInvite == null || (inviter = modelInvite.getInviter()) == null) ? null : Long.valueOf(inviter.i()), modelInvite != null ? Long.valueOf((long) modelInvite.getApproximateMemberCount()) : null, modelInvite != null ? Long.valueOf((long) modelInvite.getApproximatePresenceCount()) : null, modelInvite != null ? modelInvite.getInviteType() : null, null, modelInvite != null ? Boolean.valueOf(m.areEqual(modelInvite.code, String.valueOf((int) RestAPIAbortCodes.USER_BANNED))) : null, null); } } diff --git a/app/src/main/java/com/discord/stores/StoreInstantInvites$onInviteRemoved$1.java b/app/src/main/java/com/discord/stores/StoreInstantInvites$onInviteRemoved$1.java index 6409a5bf3c..c231c88c9f 100644 --- a/app/src/main/java/com/discord/stores/StoreInstantInvites$onInviteRemoved$1.java +++ b/app/src/main/java/com/discord/stores/StoreInstantInvites$onInviteRemoved$1.java @@ -23,7 +23,7 @@ public final class StoreInstantInvites$onInviteRemoved$1 extends o implements Fu public final void mo1invoke() { Map map; Guild guild = this.$invite.getGuild(); - Long valueOf = guild != null ? Long.valueOf(guild.q()) : null; + Long valueOf = guild != null ? Long.valueOf(guild.r()) : null; String str = this.$invite.code; if (valueOf != null && (map = (Map) StoreInstantInvites.access$getInvites$p(this.this$0).get(valueOf)) != null && ((ModelInvite) map.remove(str)) != null) { this.this$0.markChanged(); diff --git a/app/src/main/java/com/discord/stores/StoreInstantInvites.java b/app/src/main/java/com/discord/stores/StoreInstantInvites.java index 70e45ea957..934c416521 100644 --- a/app/src/main/java/com/discord/stores/StoreInstantInvites.java +++ b/app/src/main/java/com/discord/stores/StoreInstantInvites.java @@ -200,7 +200,7 @@ public final class StoreInstantInvites extends StoreV2 { this.invites.clear(); for (ModelInvite modelInvite : list) { Guild guild = modelInvite.getGuild(); - Long valueOf = guild != null ? Long.valueOf(guild.q()) : null; + Long valueOf = guild != null ? Long.valueOf(guild.r()) : null; if (valueOf != null) { Map map = this.invites.get(valueOf); if (map == null) { diff --git a/app/src/main/java/com/discord/stores/StoreLurking.java b/app/src/main/java/com/discord/stores/StoreLurking.java index 07f4586e9d..93600579cf 100644 --- a/app/src/main/java/com/discord/stores/StoreLurking.java +++ b/app/src/main/java/com/discord/stores/StoreLurking.java @@ -332,20 +332,20 @@ public final class StoreLurking { public final void handleGuildAdd$app_productionCanaryRelease(com.discord.api.guild.Guild guild) { LurkContext lurkContext; m.checkNotNullParameter(guild, "guild"); - if (!this.lurkedGuilds.keySet().contains(Long.valueOf(guild.q()))) { + if (!this.lurkedGuilds.keySet().contains(Long.valueOf(guild.r()))) { return; } - if (guild.r() == null && (lurkContext = this.lurkedGuilds.get(Long.valueOf(guild.q()))) != null && lurkContext.getShouldNavigate()) { - this.stream.getGuildSelected$app_productionCanaryRelease().handleGuildSelected(guild.q()); - } else if (guild.r() != null) { - stopLurkingInternal(guild.q()); + if (guild.s() == null && (lurkContext = this.lurkedGuilds.get(Long.valueOf(guild.r()))) != null && lurkContext.getShouldNavigate()) { + this.stream.getGuildSelected$app_productionCanaryRelease().handleGuildSelected(guild.r()); + } else if (guild.s() != null) { + stopLurkingInternal(guild.r()); } } @StoreThread public final void handleGuildRemove$app_productionCanaryRelease(com.discord.api.guild.Guild guild) { m.checkNotNullParameter(guild, "guild"); - stopLurkingInternal(guild.q()); + stopLurkingInternal(guild.r()); } @StoreThread @@ -383,7 +383,7 @@ public final class StoreLurking { @StoreThread public final boolean isLurking$app_productionCanaryRelease(com.discord.api.guild.Guild guild) { m.checkNotNullParameter(guild, "guild"); - return Companion.access$isLurking(Companion, guild.r() != null, guild.q(), this.lurkedGuilds.keySet()); + return Companion.access$isLurking(Companion, guild.s() != null, guild.r(), this.lurkedGuilds.keySet()); } @StoreThread diff --git a/app/src/main/java/com/discord/stores/StoreMentions.java b/app/src/main/java/com/discord/stores/StoreMentions.java index b1346e20f2..51d0ef031a 100644 --- a/app/src/main/java/com/discord/stores/StoreMentions.java +++ b/app/src/main/java/com/discord/stores/StoreMentions.java @@ -322,9 +322,9 @@ public final class StoreMentions extends StoreV2 { Object obj; boolean z2; m.checkNotNullParameter(guild, "guild"); - List u = guild.u(); - if (u != null) { - Iterator it = u.iterator(); + List v = guild.v(); + if (v != null) { + Iterator it = v.iterator(); while (true) { if (!it.hasNext()) { obj = null; @@ -344,19 +344,19 @@ public final class StoreMentions extends StoreV2 { } GuildMember guildMember = (GuildMember) obj; if (guildMember != null) { - this.myRoleIds.put(Long.valueOf(guild.q()), guildMember.l()); + this.myRoleIds.put(Long.valueOf(guild.r()), guildMember.l()); } } List g = guild.g(); if (g != null) { for (Channel channel : g) { - this.channelGuildIds.put(Long.valueOf(channel.h()), Long.valueOf(guild.q())); + this.channelGuildIds.put(Long.valueOf(channel.h()), Long.valueOf(guild.r())); } } - List M = guild.M(); - if (M != null) { - for (Channel channel2 : M) { - this.channelGuildIds.put(Long.valueOf(channel2.h()), Long.valueOf(guild.q())); + List N = guild.N(); + if (N != null) { + for (Channel channel2 : N) { + this.channelGuildIds.put(Long.valueOf(channel2.h()), Long.valueOf(guild.r())); } } } diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck.java b/app/src/main/java/com/discord/stores/StoreMessageAck.java index 97cdc7c110..7112ca8c38 100644 --- a/app/src/main/java/com/discord/stores/StoreMessageAck.java +++ b/app/src/main/java/com/discord/stores/StoreMessageAck.java @@ -544,9 +544,9 @@ public final class StoreMessageAck extends StoreV2 { List guilds = modelPayload.getGuilds(); m.checkNotNullExpressionValue(guilds, "payload.guilds"); for (Guild guild : guilds) { - List u = guild.u(); - if (u != null) { - Iterator it = u.iterator(); + List v = guild.v(); + if (v != null) { + Iterator it = v.iterator(); while (true) { if (!it.hasNext()) { obj = null; diff --git a/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java b/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java index 20ca9e59f5..6a3db0deae 100644 --- a/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java +++ b/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java @@ -110,10 +110,10 @@ public final class StoreMessagesMostRecent extends StoreV2 { if (g != null) { mostRecentIdsUpdateFromChannels(g); } - List M = guild.M(); - if (M != null) { + List N = guild.N(); + if (N != null) { Collection arrayList = new ArrayList<>(); - for (Channel channel : M) { + for (Channel channel : N) { if (ChannelUtils.C(channel)) { arrayList.add(channel); } @@ -131,10 +131,10 @@ public final class StoreMessagesMostRecent extends StoreV2 { if (g != null) { mostRecentIdsUpdateFromChannels(g); } - List M = guild.M(); - if (M != null) { + List N = guild.N(); + if (N != null) { Collection arrayList = new ArrayList<>(); - for (Channel channel : M) { + for (Channel channel : N) { if (ChannelUtils.C(channel)) { arrayList.add(channel); } diff --git a/app/src/main/java/com/discord/stores/StorePermissions.java b/app/src/main/java/com/discord/stores/StorePermissions.java index fd38ec1bb9..30e7697d51 100644 --- a/app/src/main/java/com/discord/stores/StorePermissions.java +++ b/app/src/main/java/com/discord/stores/StorePermissions.java @@ -219,7 +219,7 @@ public final class StorePermissions extends StoreV2 { @StoreThread public final void handleGuildAdd(com.discord.api.guild.Guild guild) { m.checkNotNullParameter(guild, "guild"); - updateGuildPermissions(guild.q(), this.storeChannels.getThreadsForGuildInternal$app_productionCanaryRelease(guild.q())); + updateGuildPermissions(guild.r(), this.storeChannels.getThreadsForGuildInternal$app_productionCanaryRelease(guild.r())); } @StoreThread @@ -233,9 +233,9 @@ public final class StorePermissions extends StoreV2 { @StoreThread public final void handleGuildRemove(com.discord.api.guild.Guild guild) { m.checkNotNullParameter(guild, "guild"); - long q = guild.q(); - this.permissionsForChannels.remove(Long.valueOf(q)); - this.permissionsForGuilds.remove(Long.valueOf(q)); + long r = guild.r(); + this.permissionsForChannels.remove(Long.valueOf(r)); + this.permissionsForGuilds.remove(Long.valueOf(r)); markChanged(); } diff --git a/app/src/main/java/com/discord/stores/StoreReviewRequest.java b/app/src/main/java/com/discord/stores/StoreReviewRequest.java index 8ed27aaed0..05ca2df3da 100644 --- a/app/src/main/java/com/discord/stores/StoreReviewRequest.java +++ b/app/src/main/java/com/discord/stores/StoreReviewRequest.java @@ -57,7 +57,7 @@ public final class StoreReviewRequest extends Store { if (!it.hasNext()) { break; } - if (((Guild) it.next()).t() >= 5) { + if (((Guild) it.next()).u() >= 5) { z3 = true; continue; } else { diff --git a/app/src/main/java/com/discord/stores/StoreRtcConnection.java b/app/src/main/java/com/discord/stores/StoreRtcConnection.java index 2df5e73f9b..9c28c20223 100644 --- a/app/src/main/java/com/discord/stores/StoreRtcConnection.java +++ b/app/src/main/java/com/discord/stores/StoreRtcConnection.java @@ -371,9 +371,9 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr return; } } - App.a aVar = App.k; + Objects.requireNonNull(App.Companion); SSLSocketFactory sSLSocketFactory = null; - if (App.j) { + if (App.access$getIS_LOCAL$cp()) { str = ""; } else { str = voiceServer.b(); diff --git a/app/src/main/java/com/discord/stores/StoreStageChannels.java b/app/src/main/java/com/discord/stores/StoreStageChannels.java index 7f6368b871..400f83b7aa 100644 --- a/app/src/main/java/com/discord/stores/StoreStageChannels.java +++ b/app/src/main/java/com/discord/stores/StoreStageChannels.java @@ -543,11 +543,11 @@ public final class StoreStageChannels extends StoreV2 { @StoreThread public final void handleGuildRemove(com.discord.api.guild.Guild guild) { m.checkNotNullParameter(guild, "guild"); - if (this.stageEventStates.remove(Long.valueOf(guild.q())) != null) { + if (this.stageEventStates.remove(Long.valueOf(guild.r())) != null) { markStageEventDirty(); } LinkedHashSet linkedHashSet = new LinkedHashSet(); - for (Number number : this.channelsStore.getChannelsForGuild(guild.q()).keySet()) { + for (Number number : this.channelsStore.getChannelsForGuild(guild.r()).keySet()) { long longValue = number.longValue(); if (this.stageRolesByChannel.remove(Long.valueOf(longValue)) != null) { linkedHashSet.add(Long.valueOf(longValue)); diff --git a/app/src/main/java/com/discord/stores/StoreStageInstances.java b/app/src/main/java/com/discord/stores/StoreStageInstances.java index 1161b02585..23f573ec56 100644 --- a/app/src/main/java/com/discord/stores/StoreStageInstances.java +++ b/app/src/main/java/com/discord/stores/StoreStageInstances.java @@ -114,9 +114,9 @@ public final class StoreStageInstances extends StoreV2 { @StoreThread public final void handleGuildAdd(Guild guild) { m.checkNotNullParameter(guild, "guild"); - List I = guild.I(); - if (I != null) { - for (StageInstance stageInstance : I) { + List J = guild.J(); + if (J != null) { + for (StageInstance stageInstance : J) { handleStageInstanceCreateOrUpdate(stageInstance); } } @@ -126,7 +126,7 @@ public final class StoreStageInstances extends StoreV2 { public final void handleGuildRemove(Guild guild) { Set set; m.checkNotNullParameter(guild, "guild"); - Map remove = this.stageInstancesByGuild.remove(Long.valueOf(guild.q())); + Map remove = this.stageInstancesByGuild.remove(Long.valueOf(guild.r())); if (remove == null || (set = remove.keySet()) == null) { set = n0.emptySet(); } diff --git a/app/src/main/java/com/discord/stores/StoreStream.java b/app/src/main/java/com/discord/stores/StoreStream.java index d4f1e43ba2..1a2989883f 100644 --- a/app/src/main/java/com/discord/stores/StoreStream.java +++ b/app/src/main/java/com/discord/stores/StoreStream.java @@ -2179,9 +2179,9 @@ public final class StoreStream { private final void handleGuildRemove(Guild guild) { if (guild != null) { this.guilds.handleGuildRemove(guild); - this.guildMemberCounts.handleGuildDelete(guild.q()); - this.guildSubscriptions.handleGuildRemove(guild.q()); - this.lazyChannelMembersStore.handleGuildRemove(guild.q()); + this.guildMemberCounts.handleGuildDelete(guild.r()); + this.guildSubscriptions.handleGuildRemove(guild.r()); + this.lazyChannelMembersStore.handleGuildRemove(guild.r()); this.presences.handleGuildRemove(guild); this.guildSelected.handleGuildRemove(guild); this.channels.handleGuildRemove(guild); @@ -2194,13 +2194,13 @@ public final class StoreStream { this.voiceStates.handleGuildRemove(guild); this.lurking.handleGuildRemove$app_productionCanaryRelease(guild); this.clientDataState.handleGuildRemove(guild); - this.threadsActive.handleGuildDelete(guild.q()); - this.threadsJoined.handleGuildDelete(guild.q()); - this.threadsActiveJoined.handleGuildDelete(guild.q()); - this.threadMessages.handleGuildDelete(guild.q()); - this.guildJoinRequests.handleGuildRemove(guild.q()); - this.guildStickers.handleGuildRemove(guild.q()); - this.guildScheduledEvents.handleGuildRemove(guild.q()); + this.threadsActive.handleGuildDelete(guild.r()); + this.threadsJoined.handleGuildDelete(guild.r()); + this.threadsActiveJoined.handleGuildDelete(guild.r()); + this.threadMessages.handleGuildDelete(guild.r()); + this.guildJoinRequests.handleGuildRemove(guild.r()); + this.guildStickers.handleGuildRemove(guild.r()); + this.guildScheduledEvents.handleGuildRemove(guild.r()); } } diff --git a/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java b/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java index 5db7ff7c8d..fe0794cf97 100644 --- a/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java +++ b/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java @@ -27,6 +27,7 @@ import com.discord.utilities.systemlog.SystemLogUtils; import com.discord.utilities.time.Clock; import d0.z.d.m; import java.util.Map; +import java.util.Objects; import javax.net.ssl.SSLSocketFactory; import kotlin.NoWhenBranchMatchedException; import kotlin.jvm.internal.DefaultConstructorMarker; @@ -562,9 +563,9 @@ public final class StoreStreamRtcConnection extends StoreV2 implements DebugPrin @StoreThread public final void handleStreamServerUpdate(StreamServerUpdate streamServerUpdate) { m.checkNotNullParameter(streamServerUpdate, "streamServerUpdate"); - App.a aVar = App.k; + Objects.requireNonNull(App.Companion); SSLSocketFactory sSLSocketFactory = null; - if (!App.j) { + if (!App.access$getIS_LOCAL$cp()) { sSLSocketFactory = SecureSocketsLayerUtils.createSocketFactory$default(null, 1, null); } StringBuilder R = a.R("Voice stream update, connect to server w/ endpoint: "); diff --git a/app/src/main/java/com/discord/stores/StoreThreadMessages.java b/app/src/main/java/com/discord/stores/StoreThreadMessages.java index 3748a5908e..a2ccab8a0d 100644 --- a/app/src/main/java/com/discord/stores/StoreThreadMessages.java +++ b/app/src/main/java/com/discord/stores/StoreThreadMessages.java @@ -203,9 +203,9 @@ public final class StoreThreadMessages extends StoreV2 { @StoreThread private final void updateFromGuild(Guild guild) { - List M = guild.M(); - if (M != null) { - for (Channel channel : M) { + List N = guild.N(); + if (N != null) { + for (Channel channel : N) { updateFromThread(channel); } } diff --git a/app/src/main/java/com/discord/stores/StoreThreadsActive.java b/app/src/main/java/com/discord/stores/StoreThreadsActive.java index 24c6d779bf..0a63c39518 100644 --- a/app/src/main/java/com/discord/stores/StoreThreadsActive.java +++ b/app/src/main/java/com/discord/stores/StoreThreadsActive.java @@ -109,10 +109,10 @@ public final class StoreThreadsActive extends StoreV2 { private final void saveThreads(Guild guild) { ThreadMetadata y2; - List threadsForGuildInternal$app_productionCanaryRelease = this.storeChannels.getThreadsForGuildInternal$app_productionCanaryRelease(guild.q()); + List threadsForGuildInternal$app_productionCanaryRelease = this.storeChannels.getThreadsForGuildInternal$app_productionCanaryRelease(guild.r()); if (!threadsForGuildInternal$app_productionCanaryRelease.isEmpty()) { Map> map = this.threadsByGuild; - Long valueOf = Long.valueOf(guild.q()); + Long valueOf = Long.valueOf(guild.r()); ArrayList arrayList = new ArrayList(); for (Object obj : threadsForGuildInternal$app_productionCanaryRelease) { Channel channel = (Channel) obj; @@ -172,7 +172,7 @@ public final class StoreThreadsActive extends StoreV2 { @StoreThread public final void handleGuildCreate(Guild guild) { m.checkNotNullParameter(guild, "guild"); - deleteThreads(guild.q()); + deleteThreads(guild.r()); saveThreads(guild); } diff --git a/app/src/main/java/com/discord/stores/StoreThreadsActiveJoined.java b/app/src/main/java/com/discord/stores/StoreThreadsActiveJoined.java index d1c118df4f..5d9cd75b12 100644 --- a/app/src/main/java/com/discord/stores/StoreThreadsActiveJoined.java +++ b/app/src/main/java/com/discord/stores/StoreThreadsActiveJoined.java @@ -216,7 +216,7 @@ public final class StoreThreadsActiveJoined extends StoreV2 { @StoreThread public final void handleGuildCreate(Guild guild) { m.checkNotNullParameter(guild, "guild"); - saveThreads(Long.valueOf(guild.q())); + saveThreads(Long.valueOf(guild.r())); } @StoreThread diff --git a/app/src/main/java/com/discord/stores/StoreThreadsJoined.java b/app/src/main/java/com/discord/stores/StoreThreadsJoined.java index 9bc62b8b26..c0da43d6ee 100644 --- a/app/src/main/java/com/discord/stores/StoreThreadsJoined.java +++ b/app/src/main/java/com/discord/stores/StoreThreadsJoined.java @@ -202,11 +202,11 @@ public final class StoreThreadsJoined extends StoreV2 { private final void saveThreads(Guild guild) { ThreadMember j; - List M = guild.M(); - if (M != null) { - for (Channel channel : M) { + List N = guild.N(); + if (N != null) { + for (Channel channel : N) { if (ChannelUtils.C(channel) && (j = channel.j()) != null) { - this.joinedThreads.put(Long.valueOf(channel.h()), new JoinedThread(channel.h(), guild.q(), j.a(), j.e(), new ModelMuteConfig(j.d()), j.c())); + this.joinedThreads.put(Long.valueOf(channel.h()), new JoinedThread(channel.h(), guild.r(), j.a(), j.e(), new ModelMuteConfig(j.d()), j.c())); markChanged(); } } @@ -238,7 +238,7 @@ public final class StoreThreadsJoined extends StoreV2 { @StoreThread public final void handleGuildCreate(Guild guild) { m.checkNotNullParameter(guild, "guild"); - deleteThreads(guild.q()); + deleteThreads(guild.r()); saveThreads(guild); } diff --git a/app/src/main/java/com/discord/stores/StoreUser.java b/app/src/main/java/com/discord/stores/StoreUser.java index 0ae7c4a036..6ec818fc9c 100644 --- a/app/src/main/java/com/discord/stores/StoreUser.java +++ b/app/src/main/java/com/discord/stores/StoreUser.java @@ -255,9 +255,9 @@ public final class StoreUser extends StoreV2 { } } for (Guild guild : modelPayload.getGuilds()) { - List u = guild.u(); - if (u != null) { - for (GuildMember guildMember : u) { + List v = guild.v(); + if (v != null) { + for (GuildMember guildMember : v) { this.users.put(Long.valueOf(guildMember.m().i()), new CoreUser(guildMember.m())); } } @@ -289,9 +289,9 @@ public final class StoreUser extends StoreV2 { @StoreThread public final void handleGuildAddOrSync(Guild guild) { m.checkNotNullParameter(guild, "guild"); - List u = guild.u(); - if (u != null) { - for (GuildMember guildMember : u) { + List v = guild.v(); + if (v != null) { + for (GuildMember guildMember : v) { updateUser(guildMember.m()); } } diff --git a/app/src/main/java/com/discord/stores/StoreUserPresence.java b/app/src/main/java/com/discord/stores/StoreUserPresence.java index eb84725bf3..6af021e4b7 100644 --- a/app/src/main/java/com/discord/stores/StoreUserPresence.java +++ b/app/src/main/java/com/discord/stores/StoreUserPresence.java @@ -467,12 +467,12 @@ public final class StoreUserPresence extends StoreV2 { @StoreThread public final void handleGuildAdd(Guild guild) { m.checkNotNullParameter(guild, "guild"); - List C = guild.C(); - if (C != null) { - for (com.discord.api.presence.Presence presence : C) { + List D = guild.D(); + if (D != null) { + for (com.discord.api.presence.Presence presence : D) { User f = presence.f(); if (f != null) { - handlePresenceUpdate(guild.q(), f.i(), presence.e(), presence.c(), presence.b()); + handlePresenceUpdate(guild.r(), f.i(), presence.e(), presence.c(), presence.b()); } } } @@ -489,7 +489,7 @@ public final class StoreUserPresence extends StoreV2 { @StoreThread public final void handleGuildRemove(Guild guild) { m.checkNotNullParameter(guild, "guild"); - clearPresences(guild.q()); + clearPresences(guild.r()); } @StoreThread diff --git a/app/src/main/java/com/discord/stores/StoreVoiceStates.java b/app/src/main/java/com/discord/stores/StoreVoiceStates.java index 04104128a7..7446db7a1f 100644 --- a/app/src/main/java/com/discord/stores/StoreVoiceStates.java +++ b/app/src/main/java/com/discord/stores/StoreVoiceStates.java @@ -156,10 +156,10 @@ public final class StoreVoiceStates extends StoreV2 { List guilds = modelPayload.getGuilds(); m.checkNotNullExpressionValue(guilds, "payload.guilds"); for (Guild guild : guilds) { - List Q = guild.Q(); - if (Q != null) { - for (VoiceState voiceState : Q) { - updateVoiceState(voiceState, Long.valueOf(guild.q())); + List R = guild.R(); + if (R != null) { + for (VoiceState voiceState : R) { + updateVoiceState(voiceState, Long.valueOf(guild.r())); } } } @@ -168,10 +168,10 @@ public final class StoreVoiceStates extends StoreV2 { @StoreThread public final void handleGuildAdd(Guild guild) { m.checkNotNullParameter(guild, "guild"); - List Q = guild.Q(); - if (Q != null) { - for (VoiceState voiceState : Q) { - updateVoiceState(voiceState, Long.valueOf(guild.q())); + List R = guild.R(); + if (R != null) { + for (VoiceState voiceState : R) { + updateVoiceState(voiceState, Long.valueOf(guild.r())); } } } @@ -179,8 +179,8 @@ public final class StoreVoiceStates extends StoreV2 { @StoreThread public final void handleGuildRemove(Guild guild) { m.checkNotNullParameter(guild, "guild"); - this.voiceStates.remove(Long.valueOf(guild.q())); - this.dirtyGuildIds.add(Long.valueOf(guild.q())); + this.voiceStates.remove(Long.valueOf(guild.r())); + this.dirtyGuildIds.add(Long.valueOf(guild.r())); markChanged(); } diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java index 200a71966d..e9ffe10666 100644 --- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java +++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java @@ -610,7 +610,7 @@ public final class AnalyticsTracker { String str2 = modelInvite.code; m.checkNotNullExpressionValue(str2, "invite.code"); com.discord.api.guild.Guild guild = modelInvite.getGuild(); - Long valueOf = guild != null ? Long.valueOf(guild.q()) : null; + Long valueOf = guild != null ? Long.valueOf(guild.r()) : null; Channel channel = modelInvite.getChannel(); Long valueOf2 = channel != null ? Long.valueOf(channel.h()) : null; Channel channel2 = modelInvite.getChannel(); @@ -652,7 +652,7 @@ public final class AnalyticsTracker { String str = modelInvite.code; m.checkNotNullExpressionValue(str, "invite.code"); com.discord.api.guild.Guild guild = modelInvite.getGuild(); - Long valueOf = guild != null ? Long.valueOf(guild.q()) : null; + Long valueOf = guild != null ? Long.valueOf(guild.r()) : null; Channel channel = modelInvite.getChannel(); Long valueOf2 = channel != null ? Long.valueOf(channel.h()) : null; Channel channel2 = modelInvite.getChannel(); @@ -1458,7 +1458,7 @@ public final class AnalyticsTracker { } com.discord.api.guild.Guild guild = modelInvite.getGuild(); if (guild != null) { - mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(guild.q())); + mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(guild.r())); } User inviter = modelInvite.getInviter(); if (inviter != null) { @@ -1582,7 +1582,7 @@ public final class AnalyticsTracker { } com.discord.api.guild.Guild guild = modelInvite.getGuild(); if (guild != null) { - map.put("invite_guild_id", Long.valueOf(guild.q())); + map.put("invite_guild_id", Long.valueOf(guild.r())); } User inviter = modelInvite.getInviter(); if (inviter != null) { diff --git a/app/src/main/java/com/discord/utilities/directories/DirectoryUtils$showServerOptions$2.java b/app/src/main/java/com/discord/utilities/directories/DirectoryUtils$showServerOptions$2.java index 21352b4154..3590a47e73 100644 --- a/app/src/main/java/com/discord/utilities/directories/DirectoryUtils$showServerOptions$2.java +++ b/app/src/main/java/com/discord/utilities/directories/DirectoryUtils$showServerOptions$2.java @@ -7,7 +7,7 @@ import c.a.a.d; import c.a.d.j; import c.a.k.b; import com.discord.R; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.app.AppFragment; import com.discord.dialogs.SimpleConfirmationDialogArgs; import com.discord.utilities.directories.DirectoryUtils; @@ -24,7 +24,7 @@ import kotlin.jvm.functions.Function1; /* compiled from: DirectoryUtils.kt */ public final class DirectoryUtils$showServerOptions$2 extends o implements Function1 { public final /* synthetic */ Context $context; - public final /* synthetic */ DirectoryEntry $directoryEntry; + public final /* synthetic */ DirectoryEntryGuild $directoryEntry; public final /* synthetic */ AppFragment $fragment; public final /* synthetic */ String $hubName; public final /* synthetic */ List $options; @@ -46,11 +46,11 @@ public final class DirectoryUtils$showServerOptions$2 extends o implements Funct } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public DirectoryUtils$showServerOptions$2(List list, Context context, DirectoryEntry directoryEntry, String str, AppFragment appFragment, Function0 function0) { + public DirectoryUtils$showServerOptions$2(List list, Context context, DirectoryEntryGuild directoryEntryGuild, String str, AppFragment appFragment, Function0 function0) { super(1); this.$options = list; this.$context = context; - this.$directoryEntry = directoryEntry; + this.$directoryEntry = directoryEntryGuild; this.$hubName = str; this.$fragment = appFragment; this.$removeGuildListener = function0; diff --git a/app/src/main/java/com/discord/utilities/directories/DirectoryUtils.java b/app/src/main/java/com/discord/utilities/directories/DirectoryUtils.java index 00b2e68f68..a7438ba4e7 100644 --- a/app/src/main/java/com/discord/utilities/directories/DirectoryUtils.java +++ b/app/src/main/java/com/discord/utilities/directories/DirectoryUtils.java @@ -7,7 +7,7 @@ import androidx.fragment.app.FragmentManager; import c.a.y.b0; import c.a.y.c0; import com.discord.R; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.app.AppFragment; import d0.t.m; import d0.t.n; @@ -62,9 +62,9 @@ public final class DirectoryUtils { private DirectoryUtils() { } - public final void showServerOptions(AppFragment appFragment, DirectoryEntry directoryEntry, String str, boolean z2, Function0 function0) { + public final void showServerOptions(AppFragment appFragment, DirectoryEntryGuild directoryEntryGuild, String str, boolean z2, Function0 function0) { d0.z.d.m.checkNotNullParameter(appFragment, "fragment"); - d0.z.d.m.checkNotNullParameter(directoryEntry, "directoryEntry"); + d0.z.d.m.checkNotNullParameter(directoryEntryGuild, "directoryEntry"); d0.z.d.m.checkNotNullParameter(str, "hubName"); d0.z.d.m.checkNotNullParameter(function0, "removeGuildListener"); Context context = appFragment.getContext(); @@ -80,7 +80,7 @@ public final class DirectoryUtils { for (DirectoryServerMenuOptions directoryServerMenuOptions : list) { arrayList.add(new c0(appFragment.getString(directoryServerMenuOptions.getTitleRes()), null, Integer.valueOf(directoryServerMenuOptions.getIconRes()), null, null, null, null, 122)); } - aVar.a(childFragmentManager, string, arrayList, false, new DirectoryUtils$showServerOptions$2(list, context, directoryEntry, str, appFragment, function0)); + aVar.a(childFragmentManager, string, arrayList, false, new DirectoryUtils$showServerOptions$2(list, context, directoryEntryGuild, str, appFragment, function0)); } } } diff --git a/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java b/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java index 2ce7c0f64a..63bab3ff26 100644 --- a/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java +++ b/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java @@ -1,6 +1,6 @@ package com.discord.utilities.directories; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.widgets.directories.DirectoryEntryData; import d0.t.u; import d0.z.d.m; @@ -14,9 +14,9 @@ public final class DirectoryUtilsKt { private static final int MINIMUM_MEMBER_COUNT = 5; private static final int MINIMUM_SIZE = 5; - public static final boolean hasMinimumMemberCount(DirectoryEntry directoryEntry) { - m.checkNotNullParameter(directoryEntry, "$this$hasMinimumMemberCount"); - Integer a = directoryEntry.e().a(); + public static final boolean hasMinimumMemberCount(DirectoryEntryGuild directoryEntryGuild) { + m.checkNotNullParameter(directoryEntryGuild, "$this$hasMinimumMemberCount"); + Integer a = directoryEntryGuild.e().a(); return (a != null ? a.intValue() : 0) >= 5; } diff --git a/app/src/main/java/com/discord/utilities/experiments/ExperimentUtils.java b/app/src/main/java/com/discord/utilities/experiments/ExperimentUtils.java index afe7559092..d7715b9d06 100644 --- a/app/src/main/java/com/discord/utilities/experiments/ExperimentUtils.java +++ b/app/src/main/java/com/discord/utilities/experiments/ExperimentUtils.java @@ -1,6 +1,7 @@ package com.discord.utilities.experiments; import com.discord.api.guild.GuildFeature; +import com.discord.api.guild.GuildHubType; import com.discord.models.experiments.domain.ExperimentHash; import com.discord.models.experiments.dto.GuildExperimentBucketDto; import com.discord.models.experiments.dto.GuildExperimentDto; @@ -24,16 +25,20 @@ public final class ExperimentUtils { private ExperimentUtils() { } - /* JADX WARNING: Removed duplicated region for block: B:102:0x0145 A[EDGE_INSN: B:102:0x0145->B:70:0x0145 ?: BREAK , SYNTHETIC] */ - /* JADX WARNING: Removed duplicated region for block: B:89:0x0095 A[SYNTHETIC] */ - /* JADX WARNING: Removed duplicated region for block: B:96:0x0074 A[SYNTHETIC] */ + /* JADX WARNING: Removed duplicated region for block: B:113:0x00a0 A[SYNTHETIC] */ + /* JADX WARNING: Removed duplicated region for block: B:116:0x00a0 A[SYNTHETIC] */ + /* JADX WARNING: Removed duplicated region for block: B:121:0x007c A[SYNTHETIC] */ + /* JADX WARNING: Removed duplicated region for block: B:123:0x007c A[SYNTHETIC] */ public final int computeGuildExperimentBucket(String str, long j, int i, Guild guild, GuildExperimentDto guildExperimentDto) { Object obj; boolean z2; boolean z3; boolean z4; boolean z5; - m.checkNotNullParameter(str, "experimentName"); + boolean z6; + boolean z7; + String str2 = str; + m.checkNotNullParameter(str2, "experimentName"); m.checkNotNullParameter(guildExperimentDto, "experiment"); for (GuildExperimentOverridesDto guildExperimentOverridesDto : guildExperimentDto.getOverrides()) { if (guildExperimentOverridesDto.getGuilds().contains(Long.valueOf(j))) { @@ -43,33 +48,40 @@ public final class ExperimentUtils { StringBuilder sb = new StringBuilder(); String hashKey = guildExperimentDto.getHashKey(); if (hashKey != null) { - str = hashKey; + str2 = hashKey; } - sb.append(str); + sb.append(str2); sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR); sb.append(j); long from = ExperimentHash.INSTANCE.from(sb.toString()) % ((long) 10000); for (GuildExperimentPopulationDto guildExperimentPopulationDto : guildExperimentDto.getPopulations()) { - boolean z6 = true; - for (GuildExperimentFilter guildExperimentFilter : guildExperimentPopulationDto.getFilters()) { - if (guildExperimentFilter instanceof GuildExperimentFilter.GuildIdsFilter) { - if (!((GuildExperimentFilter.GuildIdsFilter) guildExperimentFilter).getGuildIds().contains(Long.valueOf(j))) { + Iterator it = guildExperimentPopulationDto.getFilters().iterator(); + boolean z8 = true; + while (true) { + obj = null; + if (!it.hasNext()) { + break; + } + GuildExperimentFilter next = it.next(); + if (next instanceof GuildExperimentFilter.GuildIdsFilter) { + if (!((GuildExperimentFilter.GuildIdsFilter) next).getGuildIds().contains(Long.valueOf(j))) { } - } else if (guildExperimentFilter instanceof GuildExperimentFilter.GuildIdRangeFilter) { - if (!((GuildExperimentFilter.GuildIdRangeFilter) guildExperimentFilter).getRange().contains(j)) { + } else if (next instanceof GuildExperimentFilter.GuildIdRangeFilter) { + if (!((GuildExperimentFilter.GuildIdRangeFilter) next).getRange().contains(j)) { } - } else if (guildExperimentFilter instanceof GuildExperimentFilter.GuildMemberCountRangeFilter) { - if (!f.longRangeContains(((GuildExperimentFilter.GuildMemberCountRangeFilter) guildExperimentFilter).getRange(), i)) { + } else if (next instanceof GuildExperimentFilter.GuildMemberCountRangeFilter) { + if (!f.longRangeContains(((GuildExperimentFilter.GuildMemberCountRangeFilter) next).getRange(), i)) { + z8 = false; } - } else if (guildExperimentFilter instanceof GuildExperimentFilter.GuildHasFeatureFilter) { - Set features = ((GuildExperimentFilter.GuildHasFeatureFilter) guildExperimentFilter).getFeatures(); + } else if (next instanceof GuildExperimentFilter.GuildHasFeatureFilter) { + Set features = ((GuildExperimentFilter.GuildHasFeatureFilter) next).getFeatures(); if (!(features instanceof Collection) || !features.isEmpty()) { - Iterator it = features.iterator(); + Iterator it2 = features.iterator(); while (true) { - if (!it.hasNext()) { + if (!it2.hasNext()) { break; } - GuildFeature guildFeature = (GuildFeature) it.next(); + GuildFeature guildFeature = (GuildFeature) it2.next(); if (guild == null || !guild.hasFeature(guildFeature)) { z5 = false; continue; @@ -83,30 +95,57 @@ public final class ExperimentUtils { } } if (!z4) { + z8 = false; } } z4 = true; if (!z4) { } - } - z6 = false; - } - if (z6) { - Iterator it2 = guildExperimentPopulationDto.getBuckets().iterator(); - while (true) { - if (!it2.hasNext()) { - obj = null; - break; - } - obj = it2.next(); - List positions = ((GuildExperimentBucketDto) obj).getPositions(); - if (!(positions instanceof Collection) || !positions.isEmpty()) { - Iterator it3 = positions.iterator(); + } else if (next instanceof GuildExperimentFilter.GuildHubTypesFeatureFilter) { + Set hubTypes = ((GuildExperimentFilter.GuildHubTypesFeatureFilter) next).getHubTypes(); + if (!(hubTypes instanceof Collection) || !hubTypes.isEmpty()) { + Iterator it3 = hubTypes.iterator(); while (true) { if (!it3.hasNext()) { break; } - IntRange intRange = (IntRange) it3.next(); + if ((guild != null ? guild.getHubType() : null) == ((GuildHubType) it3.next())) { + z7 = true; + continue; + } else { + z7 = false; + continue; + } + if (z7) { + z6 = false; + break; + } + } + if (!z6) { + z8 = false; + } + } + z6 = true; + if (!z6) { + } + } + z8 = false; + } + if (z8) { + Iterator it4 = guildExperimentPopulationDto.getBuckets().iterator(); + while (true) { + if (!it4.hasNext()) { + break; + } + Object next2 = it4.next(); + List positions = ((GuildExperimentBucketDto) next2).getPositions(); + if (!(positions instanceof Collection) || !positions.isEmpty()) { + Iterator it5 = positions.iterator(); + while (true) { + if (!it5.hasNext()) { + break; + } + IntRange intRange = (IntRange) it5.next(); if (from < ((long) intRange.getFirst()) || from >= ((long) intRange.getLast())) { z3 = false; continue; @@ -120,13 +159,12 @@ public final class ExperimentUtils { break; } } - if (z2) { - break; - } } z2 = false; continue; if (z2) { + obj = next2; + break; } } GuildExperimentBucketDto guildExperimentBucketDto = (GuildExperimentBucketDto) obj; diff --git a/app/src/main/java/com/discord/utilities/features/GrowthTeamFeatures.java b/app/src/main/java/com/discord/utilities/features/GrowthTeamFeatures.java index 611f057d11..5083a5a25c 100644 --- a/app/src/main/java/com/discord/utilities/features/GrowthTeamFeatures.java +++ b/app/src/main/java/com/discord/utilities/features/GrowthTeamFeatures.java @@ -41,6 +41,10 @@ public final class GrowthTeamFeatures { return growthTeamFeatures.isExperimentEnabled(str, i, z2); } + public final boolean hubEventsEnabled(boolean z2) { + return isExperimentEnabled("2021-11_hub_events", 1, z2); + } + public final boolean hubRankingsEnabled() { return isExperimentEnabled$default(this, "2021-10_hubs_recs_and_rankings", 1, false, 2, null) || isExperimentEnabled$default(this, "2021-10_hubs_recs_and_rankings", 3, false, 2, null); } diff --git a/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java b/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java index 1634e79ccf..7cf86f0b99 100644 --- a/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java +++ b/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java @@ -40,7 +40,7 @@ public final class GuildUtilsKt { public static final Guild createApiGuild(com.discord.models.guild.Guild guild) { m.checkNotNullParameter(guild, "guild"); - return new Guild(guild.getRoles(), guild.getEmojis(), guild.getStickers(), guild.getName(), guild.getDescription(), Integer.valueOf(guild.getDefaultMessageNotifications()), guild.getId(), guild.getRegion(), guild.getOwnerId(), guild.getIcon(), guild.getVerificationLevel(), guild.getExplicitContentFilter(), null, null, null, null, guild.getUnavailable(), guild.getMfaLevel(), guild.getAfkTimeout(), guild.getAfkChannelId(), guild.getSystemChannelId(), u.toList(guild.getFeatures()), guild.getMemberCount(), guild.getBanner(), guild.getSplash(), guild.getPremiumTier(), guild.getPremiumSubscriptionCount(), guild.getSystemChannelFlags(), guild.getJoinedAt(), guild.getRulesChannelId(), guild.getPublicUpdatesChannelId(), guild.getPreferredLocale(), guild.getWelcomeScreen(), guild.getMaxVideoChannelUsers(), guild.getVanityUrlCode(), 0, guild.getApproximatePresenceCount(), null, null, null, null, guild.getNsfw(), null, null, n.emptyList()); + return new Guild(guild.getRoles(), guild.getEmojis(), guild.getStickers(), guild.getName(), guild.getDescription(), Integer.valueOf(guild.getDefaultMessageNotifications()), guild.getId(), guild.getRegion(), guild.getOwnerId(), guild.getIcon(), guild.getVerificationLevel(), guild.getExplicitContentFilter(), null, null, null, null, guild.getUnavailable(), guild.getMfaLevel(), guild.getAfkTimeout(), guild.getAfkChannelId(), guild.getSystemChannelId(), u.toList(guild.getFeatures()), guild.getMemberCount(), guild.getBanner(), guild.getSplash(), guild.getPremiumTier(), guild.getPremiumSubscriptionCount(), guild.getSystemChannelFlags(), guild.getJoinedAt(), guild.getRulesChannelId(), guild.getPublicUpdatesChannelId(), guild.getPreferredLocale(), guild.getWelcomeScreen(), guild.getMaxVideoChannelUsers(), guild.getVanityUrlCode(), 0, guild.getApproximatePresenceCount(), null, null, null, null, guild.getNsfw(), null, null, n.emptyList(), guild.getHubType()); } public static final GuildRole getGuildRole(Long l) { diff --git a/app/src/main/java/com/discord/utilities/guilds/MemberVerificationUtils.java b/app/src/main/java/com/discord/utilities/guilds/MemberVerificationUtils.java index ccbe3a8aea..6dec76baef 100644 --- a/app/src/main/java/com/discord/utilities/guilds/MemberVerificationUtils.java +++ b/app/src/main/java/com/discord/utilities/guilds/MemberVerificationUtils.java @@ -64,7 +64,7 @@ public final class MemberVerificationUtils { String str; com.discord.api.guild.Guild guild2; if (guild == null || (str = guild.getName()) == null) { - str = (modelInvite == null || (guild2 = modelInvite.getGuild()) == null) ? null : guild2.w(); + str = (modelInvite == null || (guild2 = modelInvite.getGuild()) == null) ? null : guild2.x(); } if (str != null && guild != null) { MemberVerificationSuccessDialog.Companion.enqueue(guild.getId()); diff --git a/app/src/main/java/com/discord/utilities/icon/IconUtils.java b/app/src/main/java/com/discord/utilities/icon/IconUtils.java index f3d614c6ca..d65c656292 100644 --- a/app/src/main/java/com/discord/utilities/icon/IconUtils.java +++ b/app/src/main/java/com/discord/utilities/icon/IconUtils.java @@ -759,7 +759,7 @@ public final class IconUtils { } /* JADX WARNING: Code restructure failed: missing block: B:20:0x005e, code lost: - if (r0 != null) goto L_0x0064; + if (r0 != null) goto L_0x0063; */ public final String getGiftSplashUrl(long j, String str, Integer num) { String str2; diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI.java b/app/src/main/java/com/discord/utilities/rest/RestAPI.java index 9073e9156d..b7c3abe447 100644 --- a/app/src/main/java/com/discord/utilities/rest/RestAPI.java +++ b/app/src/main/java/com/discord/utilities/rest/RestAPI.java @@ -17,7 +17,8 @@ import com.discord.api.channel.Channel; import com.discord.api.commands.ApplicationCommand; import com.discord.api.commands.ApplicationCommandData; import com.discord.api.connectedaccounts.ConnectedAccount; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryEvent; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.api.fingerprint.FingerprintResponse; import com.discord.api.friendsuggestions.BulkAddFriendsResponse; import com.discord.api.friendsuggestions.BulkFriendSuggestions; @@ -591,7 +592,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @o("channels/{channelId}/directory-entry/{guildId}") - public Observable> addServerToHub(@s("channelId") long j, @s("guildId") long j2, @i0.f0.a RestAPIParams.AddServerBody addServerBody) { + public Observable> addServerToHub(@s("channelId") long j, @s("guildId") long j2, @i0.f0.a RestAPIParams.AddServerBody addServerBody) { m.checkNotNullParameter(addServerBody, "body"); return this._api.addServerToHub(j, j2, addServerBody); } @@ -1185,10 +1186,16 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @f("channels/{channelId}/directory-entries") - public Observable> getDirectoryEntries(@s("channelId") long j) { + public Observable> getDirectoryEntries(@s("channelId") long j) { return this._api.getDirectoryEntries(j); } + @Override // com.discord.restapi.RestAPIInterface + @f("channels/{channelId}/directory-entries") + public Observable> getDirectoryGuildScheduledEvents(@s("channelId") long j, @t("type") int i) { + return this._api.getDirectoryGuildScheduledEvents(j, i); + } + @Override // com.discord.restapi.RestAPIInterface @f("emojis/{emojiId}/guild") public Observable getEmojiGuild(@s("emojiId") long j) { @@ -1670,7 +1677,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @i0.f0.n("channels/{channelId}/directory-entry/{guildId}") - public Observable modifyServerInHub(@s("channelId") long j, @s("guildId") long j2, @i0.f0.a RestAPIParams.AddServerBody addServerBody) { + public Observable modifyServerInHub(@s("channelId") long j, @s("guildId") long j2, @i0.f0.a RestAPIParams.AddServerBody addServerBody) { m.checkNotNullParameter(addServerBody, "body"); return this._api.modifyServerInHub(j, j2, addServerBody); } @@ -1781,7 +1788,7 @@ public final class RestAPI implements RestAPIInterface { Pair[] pairArr = new Pair[5]; pairArr[0] = d0.o.to(ModelAuditLogEntry.CHANGE_KEY_LOCATION, str); Guild guild = modelInvite.getGuild(); - pairArr[1] = d0.o.to("location_guild_id", guild != null ? Long.valueOf(guild.q()) : null); + pairArr[1] = d0.o.to("location_guild_id", guild != null ? Long.valueOf(guild.r()) : null); Channel channel = modelInvite.getChannel(); pairArr[2] = d0.o.to("location_channel_id", channel != null ? Long.valueOf(channel.h()) : null); Channel channel2 = modelInvite.getChannel(); @@ -1899,7 +1906,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @b("channels/{channelId}/directory-entry/{guildId}") - public Observable> removeServerFromHub(@s("channelId") long j, @s("guildId") long j2) { + public Observable> removeServerFromHub(@s("channelId") long j, @s("guildId") long j2) { return this._api.removeServerFromHub(j, j2); } @@ -2001,7 +2008,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @f("channels/{channelId}/directory-entries/search") - public Observable> searchServers(@s("channelId") long j, @t("query") String str) { + public Observable> searchServers(@s("channelId") long j, @t("query") String str) { m.checkNotNullParameter(str, "query"); return this._api.searchServers(j, str); } diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$8.java b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$8.java index 2ba7183f97..a71fabdb9c 100644 --- a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$8.java +++ b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$8.java @@ -1,21 +1,21 @@ package com.discord.utilities.rx; -import kotlin.jvm.functions.Function19; -import rx.functions.Func3; +import kotlin.jvm.functions.Function20; +import rx.functions.Func4; /* compiled from: ObservableCombineLatestOverloads.kt */ -public final class ObservableCombineLatestOverloadsKt$combineLatest$8 implements Func3, Holder, T19, R> { - public final /* synthetic */ Function19 $combineFunction; +public final class ObservableCombineLatestOverloadsKt$combineLatest$8 implements Func4, Holder, T19, T20, R> { + public final /* synthetic */ Function20 $combineFunction; - public ObservableCombineLatestOverloadsKt$combineLatest$8(Function19 function19) { - this.$combineFunction = function19; + public ObservableCombineLatestOverloadsKt$combineLatest$8(Function20 function20) { + this.$combineFunction = function20; } - public final R call(Holder holder, Holder holder2, T19 t19) { - return (R) this.$combineFunction.invoke(holder.getT1(), holder.getT2(), holder.getT3(), holder.getT4(), holder.getT5(), holder.getT6(), holder.getT7(), holder.getT8(), holder.getT9(), holder2.getT1(), holder2.getT2(), holder2.getT3(), holder2.getT4(), holder2.getT5(), holder2.getT6(), holder2.getT7(), holder2.getT8(), holder2.getT9(), t19); + public final R call(Holder holder, Holder holder2, T19 t19, T20 t20) { + return (R) this.$combineFunction.invoke(holder.getT1(), holder.getT2(), holder.getT3(), holder.getT4(), holder.getT5(), holder.getT6(), holder.getT7(), holder.getT8(), holder.getT9(), holder2.getT1(), holder2.getT2(), holder2.getT3(), holder2.getT4(), holder2.getT5(), holder2.getT6(), holder2.getT7(), holder2.getT8(), holder2.getT9(), t19, t20); } - @Override // rx.functions.Func3 - public /* bridge */ /* synthetic */ Object call(Object obj, Object obj2, Object obj3) { - return call((Holder) ((Holder) obj), (Holder) ((Holder) obj2), (Holder) obj3); + @Override // rx.functions.Func4 + public /* bridge */ /* synthetic */ Object call(Object obj, Object obj2, Object obj3, Object obj4) { + return call((Holder) ((Holder) obj), (Holder) ((Holder) obj2), (Holder) obj3, obj4); } } diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.java b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.java index ed00199f85..655ed97f9e 100644 --- a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.java +++ b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.java @@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; import kotlin.jvm.functions.Function16; -import kotlin.jvm.functions.Function19; +import kotlin.jvm.functions.Function20; import rx.Observable; /* compiled from: ObservableCombineLatestOverloads.kt */ public final class ObservableCombineLatestOverloadsKt { @@ -152,7 +152,7 @@ public final class ObservableCombineLatestOverloadsKt { return d; } - public static final Observable combineLatest(Observable observable, Observable observable2, Observable observable3, Observable observable4, Observable observable5, Observable observable6, Observable observable7, Observable observable8, Observable observable9, Observable observable10, Observable observable11, Observable observable12, Observable observable13, Observable observable14, Observable observable15, Observable observable16, Observable observable17, Observable observable18, Observable observable19, Function19 function19) { + public static final Observable combineLatest(Observable observable, Observable observable2, Observable observable3, Observable observable4, Observable observable5, Observable observable6, Observable observable7, Observable observable8, Observable observable9, Observable observable10, Observable observable11, Observable observable12, Observable observable13, Observable observable14, Observable observable15, Observable observable16, Observable observable17, Observable observable18, Observable observable19, Observable observable20, Function20 function20) { m.checkNotNullParameter(observable, "o1"); m.checkNotNullParameter(observable2, "o2"); m.checkNotNullParameter(observable3, "o3"); @@ -172,10 +172,11 @@ public final class ObservableCombineLatestOverloadsKt { m.checkNotNullParameter(observable17, "o17"); m.checkNotNullParameter(observable18, "o18"); m.checkNotNullParameter(observable19, "o19"); - m.checkNotNullParameter(function19, "combineFunction"); - Observable i = Observable.i(createHolderObservable(observable, observable2, observable3, observable4, observable5, observable6, observable7, observable8, observable9), createHolderObservable(observable10, observable11, observable12, observable13, observable14, observable15, observable16, observable17, observable18), observable19, new ObservableCombineLatestOverloadsKt$combineLatest$8(function19)); - m.checkNotNullExpressionValue(i, "Observable\n .comb…o19\n )\n }"); - return i; + m.checkNotNullParameter(observable20, "o20"); + m.checkNotNullParameter(function20, "combineFunction"); + Observable h = Observable.h(createHolderObservable(observable, observable2, observable3, observable4, observable5, observable6, observable7, observable8, observable9), createHolderObservable(observable10, observable11, observable12, observable13, observable14, observable15, observable16, observable17, observable18), observable19, observable20, new ObservableCombineLatestOverloadsKt$combineLatest$8(function20)); + m.checkNotNullExpressionValue(h, "Observable\n .comb…o20\n )\n }"); + return h; } private static final Observable> createHolderObservable(Observable observable, Observable observable2, Observable observable3, Observable observable4, Observable observable5, Observable observable6, Observable observable7, Observable observable8, Observable observable9) { diff --git a/app/src/main/java/com/discord/widgets/auth/AuthInviteInfoView.java b/app/src/main/java/com/discord/widgets/auth/AuthInviteInfoView.java index a4d9b71df4..360b190699 100644 --- a/app/src/main/java/com/discord/widgets/auth/AuthInviteInfoView.java +++ b/app/src/main/java/com/discord/widgets/auth/AuthInviteInfoView.java @@ -162,7 +162,7 @@ public final class AuthInviteInfoView extends RelativeLayout { textView.setText(b.l(getIntroText(modelInvite), new Object[0], null, 2)); TextView textView2 = this.binding.f1724c; m.checkNotNullExpressionValue(textView2, "binding.authInviteInfoGuildName"); - textView2.setText(guild.w()); + textView2.setText(guild.x()); return; } return; diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.java index 7b3322d28a..1d69f16c16 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.java @@ -1,7 +1,8 @@ package com.discord.widgets.channels.list; import com.discord.api.channel.Channel; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryEvent; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.api.guildscheduledevent.GuildScheduledEvent; import com.discord.api.stageinstance.StageInstance; import com.discord.models.guild.Guild; @@ -22,18 +23,18 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import kotlin.jvm.functions.Function19; +import kotlin.jvm.functions.Function20; /* compiled from: WidgetChannelListModel.kt */ -public final class WidgetChannelListModel$Companion$getSelectedGuildChannelList$1 extends o implements Function19, Map, Map>, Set, Channel, Long, Map>, Map, Set, Set, StoreNux.NuxState, Map, Map, List, Boolean, Boolean, Map>>, Map, WidgetChannelListModel> { +public final class WidgetChannelListModel$Companion$getSelectedGuildChannelList$1 extends o implements Function20, Map, Map>, Set, Channel, Long, Map>, Map, Set, Set, StoreNux.NuxState, Map, Map, List, Boolean, Boolean, Map>>, Map, Map>>, WidgetChannelListModel> { public final /* synthetic */ long $selectedGuildId; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChannelListModel$Companion$getSelectedGuildChannelList$1(long j) { - super(19); + super(20); this.$selectedGuildId = j; } - public final WidgetChannelListModel invoke(GuildChannelsInfo guildChannelsInfo, Map map, Map map2, Map> map3, Set set, Channel channel, long j, Map> map4, Map map5, Set set2, Set set3, StoreNux.NuxState nuxState, Map map6, Map map7, List list, boolean z2, boolean z3, Map>> map8, Map map9) { + public final WidgetChannelListModel invoke(GuildChannelsInfo guildChannelsInfo, Map map, Map map2, Map> map3, Set set, Channel channel, long j, Map> map4, Map map5, Set set2, Set set3, StoreNux.NuxState nuxState, Map map6, Map map7, List list, boolean z2, boolean z3, Map>> map8, Map map9, Map>> map10) { boolean z4; m.checkNotNullParameter(guildChannelsInfo, "guildChannelsInfo"); m.checkNotNullParameter(map, "guildChannels"); @@ -50,7 +51,8 @@ public final class WidgetChannelListModel$Companion$getSelectedGuildChannelList$ m.checkNotNullParameter(list, "guildScheduledEvents"); m.checkNotNullParameter(map8, "directories"); m.checkNotNullParameter(map9, "messageAcks"); - List plus = u.plus((Collection) WidgetChannelListModel.Companion.access$guildListBuilder(WidgetChannelListModel.Companion, this.$selectedGuildId, guildChannelsInfo, map, map3, map2, set, channel, j, map4, map5, set2, set3, map6, map7, list, z2, z3, map8, map9), new ChannelListBottomNavSpaceItem(this.$selectedGuildId)); + m.checkNotNullParameter(map10, "directoryEvents"); + List plus = u.plus((Collection) WidgetChannelListModel.Companion.access$guildListBuilder(WidgetChannelListModel.Companion, this.$selectedGuildId, guildChannelsInfo, map, map3, map2, set, channel, j, map4, map5, set2, set3, map6, map7, list, z2, z3, map8, map9, map10), new ChannelListBottomNavSpaceItem(this.$selectedGuildId)); if (nuxState.getPremiumGuildHintGuildId() != null) { Long premiumGuildHintGuildId = nuxState.getPremiumGuildHintGuildId(); Guild guild = guildChannelsInfo.getGuild(); @@ -64,9 +66,9 @@ public final class WidgetChannelListModel$Companion$getSelectedGuildChannelList$ } /* Return type fixed from 'java.lang.Object' to match base method */ - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ - @Override // kotlin.jvm.functions.Function19 - public /* bridge */ /* synthetic */ WidgetChannelListModel invoke(GuildChannelsInfo guildChannelsInfo, Map map, Map map2, Map> map3, Set set, Channel channel, Long l, Map> map4, Map map5, Set set2, Set set3, StoreNux.NuxState nuxState, Map map6, Map map7, List list, Boolean bool, Boolean bool2, Map>> map8, Map map9) { - return invoke(guildChannelsInfo, (Map) map, (Map) map2, (Map>) map3, (Set) set, channel, l.longValue(), (Map>) map4, (Map) map5, (Set) set2, (Set) set3, nuxState, (Map) map6, (Map) map7, (List) list, bool.booleanValue(), bool2.booleanValue(), (Map>>) map8, (Map) map9); + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function20 + public /* bridge */ /* synthetic */ WidgetChannelListModel invoke(GuildChannelsInfo guildChannelsInfo, Map map, Map map2, Map> map3, Set set, Channel channel, Long l, Map> map4, Map map5, Set set2, Set set3, StoreNux.NuxState nuxState, Map map6, Map map7, List list, Boolean bool, Boolean bool2, Map>> map8, Map map9, Map>> map10) { + return invoke(guildChannelsInfo, (Map) map, (Map) map2, (Map>) map3, (Set) set, channel, l.longValue(), (Map>) map4, (Map) map5, (Set) set2, (Set) set3, nuxState, (Map) map6, (Map) map7, (List) list, bool.booleanValue(), bool2.booleanValue(), (Map>>) map8, (Map) map9, (Map>>) map10); } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java index b77d6ad6e9..3c51cdf63b 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java @@ -26,6 +26,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; public final /* synthetic */ Map $directories$inlined; + public final /* synthetic */ Map $directoryEvents$inlined; public final /* synthetic */ HashSet $forceViewCategories$inlined; public final /* synthetic */ GuildChannelsInfo $guild$inlined; public final /* synthetic */ List $guildScheduledEvents$inlined; @@ -125,7 +126,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1(boolean z2, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z3, Channel channel, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, boolean z4, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1(boolean z2, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z3, Channel channel, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, boolean z4, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8, Map map9) { super(3); this.$isCategoryMuted = z2; this.$guild$inlined = guildChannelsInfo; @@ -153,6 +154,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; this.$messageAcks$inlined = map7; this.$directories$inlined = map8; + this.$directoryEvents$inlined = map9; } public static /* synthetic */ WidgetChannelListModel.Companion.TextLikeChannelData invoke$default(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1, Channel channel, boolean z2, Boolean bool, int i, Object obj) { diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java index 5afde715ea..933175adda 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java @@ -29,6 +29,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; public final /* synthetic */ Map $directories$inlined; + public final /* synthetic */ Map $directoryEvents$inlined; public final /* synthetic */ HashSet $forceViewCategories$inlined; public final /* synthetic */ GuildChannelsInfo $guild$inlined; public final /* synthetic */ List $guildScheduledEvents$inlined; @@ -51,7 +52,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2(long j, Channel channel, Long l, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z2, Channel channel2, Map map, Set set, long j2, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j3, Map map2, boolean z3, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2(long j, Channel channel, Long l, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z2, Channel channel2, Map map, Set set, long j2, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j3, Map map2, boolean z3, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8, Map map9) { super(1); this.$channelId = j; this.$channel = channel; @@ -81,6 +82,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; this.$messageAcks$inlined = map7; this.$directories$inlined = map8; + this.$directoryEvents$inlined = map9; } public final WidgetChannelListModel.Companion.VocalChannelData invoke(Channel channel) { diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.java index 8045a24c18..0779b577f3 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.java @@ -22,6 +22,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; public final /* synthetic */ Map $directories$inlined; + public final /* synthetic */ Map $directoryEvents$inlined; public final /* synthetic */ HashSet $forceViewCategories$inlined; public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 $getTextLikeChannelData$1; public final /* synthetic */ GuildChannelsInfo $guild$inlined; @@ -46,7 +47,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3(Channel channel, Long l, WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1, boolean z2, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z3, Channel channel2, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, boolean z4, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3(Channel channel, Long l, WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1, boolean z2, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z3, Channel channel2, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, boolean z4, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8, Map map9) { super(0); this.$channel = channel; this.$permissions = l; @@ -77,6 +78,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; this.$messageAcks$inlined = map7; this.$directories$inlined = map8; + this.$directoryEvents$inlined = map9; } @Override // kotlin.jvm.functions.Function0 diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.java index 3c8f993d60..6403d7331a 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.java @@ -23,6 +23,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; public final /* synthetic */ Map $directories$inlined; + public final /* synthetic */ Map $directoryEvents$inlined; public final /* synthetic */ HashSet $forceViewCategories$inlined; public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 $getTextLikeChannelData$1; public final /* synthetic */ GuildChannelsInfo $guild$inlined; @@ -45,7 +46,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z2, Channel channel, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, boolean z3, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z2, Channel channel, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, boolean z3, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8, Map map9) { super(2); this.$getTextLikeChannelData$1 = widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1; this.$guild$inlined = guildChannelsInfo; @@ -73,6 +74,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; this.$messageAcks$inlined = map7; this.$directories$inlined = map8; + this.$directoryEvents$inlined = map9; } public final ChannelListItemThread invoke(Channel channel, StoreThreadsJoined.JoinedThread joinedThread) { diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5.java index 69e6389483..f613fac5e5 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5.java @@ -28,6 +28,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; public final /* synthetic */ Map $directories$inlined; + public final /* synthetic */ Map $directoryEvents$inlined; public final /* synthetic */ HashSet $forceViewCategories$inlined; public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 $getVocalChannelData$2; public final /* synthetic */ GuildChannelsInfo $guild$inlined; @@ -51,7 +52,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2, Channel channel, Long l, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z2, Channel channel2, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, boolean z3, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2, Channel channel, Long l, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z2, Channel channel2, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, boolean z3, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8, Map map9) { super(0); this.$getVocalChannelData$2 = widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2; this.$channel = channel; @@ -81,6 +82,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; this.$messageAcks$inlined = map7; this.$directories$inlined = map8; + this.$directoryEvents$inlined = map9; } /* JADX DEBUG: Multi-variable search result rejected for r4v1, resolved type: java.lang.Object */ diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6.java index a46087f780..0a77c22b94 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6.java @@ -23,6 +23,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; public final /* synthetic */ Map $directories$inlined; + public final /* synthetic */ Map $directoryEvents$inlined; public final /* synthetic */ HashSet $forceViewCategories$inlined; public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 $getVocalChannelData$2; public final /* synthetic */ GuildChannelsInfo $guild$inlined; @@ -46,7 +47,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2, Channel channel, Long l, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z2, Channel channel2, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, boolean z3, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2, Channel channel, Long l, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z2, Channel channel2, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, boolean z3, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8, Map map9) { super(0); this.$getVocalChannelData$2 = widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2; this.$channel = channel; @@ -76,6 +77,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; this.$messageAcks$inlined = map7; this.$directories$inlined = map8; + this.$directoryEvents$inlined = map9; } @Override // kotlin.jvm.functions.Function0 diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7.java index f838ff6c1b..fd7aab4606 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7.java @@ -23,6 +23,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; public final /* synthetic */ Map $directories$inlined; + public final /* synthetic */ Map $directoryEvents$inlined; public final /* synthetic */ HashSet $forceViewCategories$inlined; public final /* synthetic */ GuildChannelsInfo $guild$inlined; public final /* synthetic */ List $guildScheduledEvents$inlined; @@ -45,7 +46,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z2, Channel channel, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, boolean z3, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z2, Channel channel, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, boolean z3, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8, Map map9) { super(1); this.$toChannelListItemThread$4 = widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4; this.$guild$inlined = guildChannelsInfo; @@ -73,6 +74,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; this.$messageAcks$inlined = map7; this.$directories$inlined = map8; + this.$directoryEvents$inlined = map9; } public final Collection invoke(Channel channel) { diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8.java index 52719f5ec2..82611efc5c 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8.java @@ -23,6 +23,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; public final /* synthetic */ Map $directories$inlined; + public final /* synthetic */ Map $directoryEvents$inlined; public final /* synthetic */ HashSet $forceViewCategories$inlined; public final /* synthetic */ GuildChannelsInfo $guild$inlined; public final /* synthetic */ List $guildScheduledEvents$inlined; @@ -44,7 +45,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8(long j, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z2, Channel channel, Map map, Set set, long j2, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j3, Map map2, boolean z3, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8(long j, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, boolean z2, Channel channel, Map map, Set set, long j2, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j3, Map map2, boolean z3, Set set3, List list, Map map3, Map map4, Map map5, Map map6, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, Map map7, Map map8, Map map9) { super(0); this.$channelId = j; this.$guild$inlined = guildChannelsInfo; @@ -72,6 +73,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; this.$messageAcks$inlined = map7; this.$directories$inlined = map8; + this.$directoryEvents$inlined = map9; } /* Return type fixed from 'java.util.Collection' to match base method */ diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java index 33a48452cb..1fc72f2201 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java @@ -413,8 +413,8 @@ public final class WidgetChannelListModel { return companion.getSelectedGuildChannelList(j); } - public static final /* synthetic */ List access$guildListBuilder(Companion companion, long j, GuildChannelsInfo guildChannelsInfo, Map map, Map map2, Map map3, Set set, Channel channel, long j2, Map map4, Map map5, Set set2, Set set3, Map map6, Map map7, List list, boolean z2, boolean z3, Map map8, Map map9) { - return companion.guildListBuilder(j, guildChannelsInfo, map, map2, map3, set, channel, j2, map4, map5, set2, set3, map6, map7, list, z2, z3, map8, map9); + public static final /* synthetic */ List access$guildListBuilder(Companion companion, long j, GuildChannelsInfo guildChannelsInfo, Map map, Map map2, Map map3, Set set, Channel channel, long j2, Map map4, Map map5, Set set2, Set set3, Map map6, Map map7, List list, boolean z2, boolean z3, Map map8, Map map9, Map map10) { + return companion.guildListBuilder(j, guildChannelsInfo, map, map2, map3, set, channel, j2, map4, map5, set2, set3, map6, map7, list, z2, z3, map8, map9, map10); } /* JADX WARNING: Removed duplicated region for block: B:101:0x0195 A[EDGE_INSN: B:101:0x0195->B:81:0x0195 ?: BREAK , SYNTHETIC] */ @@ -560,22 +560,22 @@ public final class WidgetChannelListModel { private final Observable getSelectedGuildChannelList(long j) { Observable observable = GuildChannelsInfo.Companion.get(j); StoreStream.Companion companion = StoreStream.Companion; - return ObservableCombineLatestOverloadsKt.combineLatest(observable, StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null), companion.getThreadsJoined().observeJoinedThreads(), companion.getThreadsActiveJoined().observeActiveJoinedThreadsForGuild(j), companion.getThreadsActive().observeChannelsWithActiveThreadsByGuild(j), companion.getChannelsSelected().observeSelectedChannel(), companion.getVoiceChannelSelected().observeSelectedVoiceChannelId(), VoiceStates.get$default(VoiceStates.INSTANCE, j, null, 2, null), companion.getMentions().observeMentionCounts(), companion.getReadStates().getUnreadChannelIds(), companion.getStoreChannelCategories().observeCollapsedCategories(j), companion.getNux().getNuxState(), companion.getStageChannels().observeGuildStageChannels(j), companion.getStageInstances().observeStageInstancesForGuild(j), StoreGuildScheduledEvents.observeGuildScheduledEvents$default(companion.getGuildScheduledEvents(), j, false, 2, null), GuildScheduledEventUtilities.Companion.observeCanCreateAnyEvent$default(GuildScheduledEventUtilities.Companion, j, null, null, null, 14, null), GuildRoleSubscriptionsFeatureFlag.Companion.getINSTANCE().observeCanGuildSeeGuildRoleSubscriptions(j), companion.getDirectories().observeDirectories(), companion.getMessageAck().observeAll(), new WidgetChannelListModel$Companion$getSelectedGuildChannelList$1(j)); + return ObservableCombineLatestOverloadsKt.combineLatest(observable, StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null), companion.getThreadsJoined().observeJoinedThreads(), companion.getThreadsActiveJoined().observeActiveJoinedThreadsForGuild(j), companion.getThreadsActive().observeChannelsWithActiveThreadsByGuild(j), companion.getChannelsSelected().observeSelectedChannel(), companion.getVoiceChannelSelected().observeSelectedVoiceChannelId(), VoiceStates.get$default(VoiceStates.INSTANCE, j, null, 2, null), companion.getMentions().observeMentionCounts(), companion.getReadStates().getUnreadChannelIds(), companion.getStoreChannelCategories().observeCollapsedCategories(j), companion.getNux().getNuxState(), companion.getStageChannels().observeGuildStageChannels(j), companion.getStageInstances().observeStageInstancesForGuild(j), StoreGuildScheduledEvents.observeGuildScheduledEvents$default(companion.getGuildScheduledEvents(), j, false, 2, null), GuildScheduledEventUtilities.Companion.observeCanCreateAnyEvent$default(GuildScheduledEventUtilities.Companion, j, null, null, null, 14, null), GuildRoleSubscriptionsFeatureFlag.Companion.getINSTANCE().observeCanGuildSeeGuildRoleSubscriptions(j), companion.getDirectories().observeDirectories(), companion.getMessageAck().observeAll(), companion.getDirectories().observeDirectoryGuildScheduledEvents(), new WidgetChannelListModel$Companion$getSelectedGuildChannelList$1(j)); } /* JADX ERROR: IndexOutOfBoundsException in pass: SSATransform - java.lang.IndexOutOfBoundsException: bitIndex < 0: -66 + java.lang.IndexOutOfBoundsException: bitIndex < 0: -61 at java.base/java.util.BitSet.get(BitSet.java:626) at jadx.core.dex.visitors.ssa.LiveVarAnalysis.fillBasicBlockInfo(LiveVarAnalysis.java:65) at jadx.core.dex.visitors.ssa.LiveVarAnalysis.runAnalysis(LiveVarAnalysis.java:36) at jadx.core.dex.visitors.ssa.SSATransform.process(SSATransform.java:55) at jadx.core.dex.visitors.ssa.SSATransform.visit(SSATransform.java:41) */ - private final java.util.List guildListBuilder(long r173, com.discord.utilities.channel.GuildChannelsInfo r175, java.util.Map r176, java.util.Map> r177, java.util.Map r178, java.util.Set r179, com.discord.api.channel.Channel r180, long r181, java.util.Map> r183, java.util.Map r184, java.util.Set r185, java.util.Set r186, java.util.Map r187, java.util.Map r188, java.util.List r189, boolean r190, boolean r191, java.util.Map>> r192, java.util.Map r193) { + private final java.util.List guildListBuilder(long r178, com.discord.utilities.channel.GuildChannelsInfo r180, java.util.Map r181, java.util.Map> r182, java.util.Map r183, java.util.Set r184, com.discord.api.channel.Channel r185, long r186, java.util.Map> r188, java.util.Map r189, java.util.Set r190, java.util.Set r191, java.util.Map r192, java.util.Map r193, java.util.List r194, boolean r195, boolean r196, java.util.Map>> r197, java.util.Map r198, java.util.Map>> r199) { /* - // Method dump skipped, instructions count: 1550 + // Method dump skipped, instructions count: 1688 */ - throw new UnsupportedOperationException("Method not decompiled: com.discord.widgets.channels.list.WidgetChannelListModel.Companion.guildListBuilder(long, com.discord.utilities.channel.GuildChannelsInfo, java.util.Map, java.util.Map, java.util.Map, java.util.Set, com.discord.api.channel.Channel, long, java.util.Map, java.util.Map, java.util.Set, java.util.Set, java.util.Map, java.util.Map, java.util.List, boolean, boolean, java.util.Map, java.util.Map):java.util.List"); + throw new UnsupportedOperationException("Method not decompiled: com.discord.widgets.channels.list.WidgetChannelListModel.Companion.guildListBuilder(long, com.discord.utilities.channel.GuildChannelsInfo, java.util.Map, java.util.Map, java.util.Map, java.util.Set, com.discord.api.channel.Channel, long, java.util.Map, java.util.Map, java.util.Set, java.util.Set, java.util.Map, java.util.Map, java.util.List, boolean, boolean, java.util.Map, java.util.Map, java.util.Map):java.util.List"); } public final Observable get() { diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$8.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$8.java index 3b588e44c8..b31896c263 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$8.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$8.java @@ -1,13 +1,15 @@ package com.discord.widgets.channels.list; import androidx.fragment.app.FragmentManager; +import com.discord.models.guild.Guild; import com.discord.widgets.guildscheduledevent.WidgetGuildScheduledEventListBottomSheet; +import com.discord.widgets.hubs.events.WidgetHubEventsPage; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChannelsList.kt */ -public final class WidgetChannelsList$onViewBound$8 extends o implements Function1 { +public final class WidgetChannelsList$onViewBound$8 extends o implements Function1 { public final /* synthetic */ WidgetChannelsList this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -19,15 +21,23 @@ public final class WidgetChannelsList$onViewBound$8 extends o implements Functio /* Return type fixed from 'java.lang.Object' to match base method */ /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(Long l) { - invoke(l.longValue()); + public /* bridge */ /* synthetic */ Unit invoke(Guild guild) { + invoke(guild); return Unit.a; } - public final void invoke(long j) { - WidgetGuildScheduledEventListBottomSheet.Companion companion = WidgetGuildScheduledEventListBottomSheet.Companion; - FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); - m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - WidgetGuildScheduledEventListBottomSheet.Companion.show$default(companion, parentFragmentManager, j, null, 4, null); + public final void invoke(Guild guild) { + m.checkNotNullParameter(guild, "guild"); + if (guild.isHub()) { + WidgetHubEventsPage.Companion companion = WidgetHubEventsPage.Companion; + FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); + m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); + companion.show(parentFragmentManager, guild.getId()); + return; + } + WidgetGuildScheduledEventListBottomSheet.Companion companion2 = WidgetGuildScheduledEventListBottomSheet.Companion; + FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager(); + m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager"); + WidgetGuildScheduledEventListBottomSheet.Companion.show$default(companion2, parentFragmentManager2, guild.getId(), null, 4, null); } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemGuildScheduledEvents$onConfigure$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemGuildScheduledEvents$onConfigure$1.java index fa3ca773f0..d737837b6e 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemGuildScheduledEvents$onConfigure$1.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemGuildScheduledEvents$onConfigure$1.java @@ -15,6 +15,6 @@ public final class WidgetChannelsListAdapter$ItemGuildScheduledEvents$onConfigur @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetChannelsListAdapter.ItemGuildScheduledEvents.access$getAdapter$p(this.this$0).getOnViewGuildScheduledEvents().invoke(Long.valueOf(this.$item.getGuildId())); + WidgetChannelsListAdapter.ItemGuildScheduledEvents.access$getAdapter$p(this.this$0).getOnViewGuildScheduledEvents().invoke(this.$item.getGuild()); } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onViewGuildScheduledEvents$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onViewGuildScheduledEvents$1.java index bbac183124..21b260f592 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onViewGuildScheduledEvents$1.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onViewGuildScheduledEvents$1.java @@ -1,10 +1,12 @@ package com.discord.widgets.channels.list; +import com.discord.models.guild.Guild; +import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChannelsListAdapter.kt */ -public final class WidgetChannelsListAdapter$onViewGuildScheduledEvents$1 extends o implements Function1 { +public final class WidgetChannelsListAdapter$onViewGuildScheduledEvents$1 extends o implements Function1 { public static final WidgetChannelsListAdapter$onViewGuildScheduledEvents$1 INSTANCE = new WidgetChannelsListAdapter$onViewGuildScheduledEvents$1(); public WidgetChannelsListAdapter$onViewGuildScheduledEvents$1() { @@ -14,11 +16,12 @@ public final class WidgetChannelsListAdapter$onViewGuildScheduledEvents$1 extend /* Return type fixed from 'java.lang.Object' to match base method */ /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(Long l) { - invoke(l.longValue()); + public /* bridge */ /* synthetic */ Unit invoke(Guild guild) { + invoke(guild); return Unit.a; } - public final void invoke(long j) { + public final void invoke(Guild guild) { + m.checkNotNullParameter(guild, "it"); } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java index a02a73a45f..e87f343b1d 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java @@ -45,6 +45,7 @@ import com.discord.databinding.WidgetChannelsListItemHeaderBinding; import com.discord.databinding.WidgetChannelsListItemMfaBinding; import com.discord.databinding.WidgetChannelsListItemThreadBinding; import com.discord.databinding.WidgetChannelsListItemVoiceUserBinding; +import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; import com.discord.models.presence.Presence; import com.discord.models.user.User; @@ -109,7 +110,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple onSelectInvite = WidgetChannelsListAdapter$onSelectInvite$1.INSTANCE; private Function2 onSelectUserOptions = WidgetChannelsListAdapter$onSelectUserOptions$1.INSTANCE; private Function0 onViewGuildRoleSubscriptions = WidgetChannelsListAdapter$onViewGuildRoleSubscriptions$1.INSTANCE; - private Function1 onViewGuildScheduledEvents = WidgetChannelsListAdapter$onViewGuildScheduledEvents$1.INSTANCE; + private Function1 onViewGuildScheduledEvents = WidgetChannelsListAdapter$onViewGuildScheduledEvents$1.INSTANCE; private long selectedGuildId; /* compiled from: WidgetChannelsListAdapter.kt */ @@ -1794,8 +1795,8 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple, kotlin.jvm.functions.Function1 */ - public final Function1 getOnViewGuildScheduledEvents() { + /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1 */ + public final Function1 getOnViewGuildScheduledEvents() { return this.onViewGuildScheduledEvents; } @@ -1913,7 +1914,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple function1) { + public final void setOnViewGuildScheduledEvents(Function1 function1) { m.checkNotNullParameter(function1, ""); this.onViewGuildScheduledEvents = function1; } diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemGuildScheduledEvents.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemGuildScheduledEvents.java index b98c100781..ead0b6e330 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemGuildScheduledEvents.java +++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemGuildScheduledEvents.java @@ -1,46 +1,48 @@ package com.discord.widgets.channels.list.items; -import a0.a.a.b; import c.d.b.a.a; import com.discord.api.guildscheduledevent.GuildScheduledEvent; +import com.discord.models.guild.Guild; import d0.z.d.m; import java.util.List; /* compiled from: ChannelListItemGuildScheduledEvents.kt */ public final class ChannelListItemGuildScheduledEvents implements ChannelListItem { private final List data; - private final long guildId; + private final Guild guild; private final String key = String.valueOf(getType()); private final int type = 19; - public ChannelListItemGuildScheduledEvents(List list, long j) { + public ChannelListItemGuildScheduledEvents(List list, Guild guild) { m.checkNotNullParameter(list, "data"); + m.checkNotNullParameter(guild, "guild"); this.data = list; - this.guildId = j; + this.guild = guild; } /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.channels.list.items.ChannelListItemGuildScheduledEvents */ /* JADX WARN: Multi-variable type inference failed */ - public static /* synthetic */ ChannelListItemGuildScheduledEvents copy$default(ChannelListItemGuildScheduledEvents channelListItemGuildScheduledEvents, List list, long j, int i, Object obj) { + public static /* synthetic */ ChannelListItemGuildScheduledEvents copy$default(ChannelListItemGuildScheduledEvents channelListItemGuildScheduledEvents, List list, Guild guild, int i, Object obj) { if ((i & 1) != 0) { list = channelListItemGuildScheduledEvents.data; } if ((i & 2) != 0) { - j = channelListItemGuildScheduledEvents.guildId; + guild = channelListItemGuildScheduledEvents.guild; } - return channelListItemGuildScheduledEvents.copy(list, j); + return channelListItemGuildScheduledEvents.copy(list, guild); } public final List component1() { return this.data; } - public final long component2() { - return this.guildId; + public final Guild component2() { + return this.guild; } - public final ChannelListItemGuildScheduledEvents copy(List list, long j) { + public final ChannelListItemGuildScheduledEvents copy(List list, Guild guild) { m.checkNotNullParameter(list, "data"); - return new ChannelListItemGuildScheduledEvents(list, j); + m.checkNotNullParameter(guild, "guild"); + return new ChannelListItemGuildScheduledEvents(list, guild); } public boolean equals(Object obj) { @@ -51,15 +53,15 @@ public final class ChannelListItemGuildScheduledEvents implements ChannelListIte return false; } ChannelListItemGuildScheduledEvents channelListItemGuildScheduledEvents = (ChannelListItemGuildScheduledEvents) obj; - return m.areEqual(this.data, channelListItemGuildScheduledEvents.data) && this.guildId == channelListItemGuildScheduledEvents.guildId; + return m.areEqual(this.data, channelListItemGuildScheduledEvents.data) && m.areEqual(this.guild, channelListItemGuildScheduledEvents.guild); } public final List getData() { return this.data; } - public final long getGuildId() { - return this.guildId; + public final Guild getGuild() { + return this.guild; } @Override // com.discord.widgets.channels.list.items.ChannelListItem, com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider @@ -74,13 +76,21 @@ public final class ChannelListItemGuildScheduledEvents implements ChannelListIte public int hashCode() { List list = this.data; - return b.a(this.guildId) + ((list != null ? list.hashCode() : 0) * 31); + int i = 0; + int hashCode = (list != null ? list.hashCode() : 0) * 31; + Guild guild = this.guild; + if (guild != null) { + i = guild.hashCode(); + } + return hashCode + i; } public String toString() { StringBuilder R = a.R("ChannelListItemGuildScheduledEvents(data="); R.append(this.data); - R.append(", guildId="); - return a.B(R, this.guildId, ")"); + R.append(", guild="); + R.append(this.guild); + R.append(")"); + return R.toString(); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java b/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java index 84c6c8a431..5136bc4b82 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java +++ b/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java @@ -94,12 +94,13 @@ public final class WidgetChatList extends AppFragment { FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); WidgetChatListAdapter widgetChatListAdapter = new WidgetChatListAdapter(recyclerView, this, parentFragmentManager, new WidgetChatListAdapterEventsHandler(this, getFlexInputViewModel(), null, null, null, null, null, null, null, null, null, null, 4092, null), getFlexInputViewModel(), ClockFactory.get()); - WidgetChatListAdapter widgetChatListAdapter2 = (WidgetChatListAdapter) MGRecyclerAdapter.Companion.configure(widgetChatListAdapter); + MGRecyclerAdapter.Companion.configure(widgetChatListAdapter); + addThreadSpineItemDecoration(widgetChatListAdapter); LinearLayoutManager layoutManager = widgetChatListAdapter.getLayoutManager(); if (layoutManager != null) { layoutManager.setReverseLayout(true); } - addThreadSpineItemDecoration(widgetChatListAdapter); + widgetChatListAdapter.setStateRestorationPolicy(RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY); this.adapter = widgetChatListAdapter; } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1.java index d77255de3d..5283d62637 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1.java @@ -12,7 +12,7 @@ import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; /* compiled from: WidgetChatListAdapter.kt */ -@e(c = "com.discord.widgets.chat.list.adapter.WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1", f = "WidgetChatListAdapter.kt", l = {421}, m = "invokeSuspend") +@e(c = "com.discord.widgets.chat.list.adapter.WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1", f = "WidgetChatListAdapter.kt", l = {427}, m = "invokeSuspend") public final class WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1 extends k implements Function2, Object> { public final /* synthetic */ TransitionDrawable $transition; public int label; diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$scheduleRetry$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$scheduleRetry$1.java index a2982bf4e3..002150fdc4 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$scheduleRetry$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$scheduleRetry$1.java @@ -12,7 +12,7 @@ import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; /* compiled from: WidgetChatListAdapter.kt */ -@e(c = "com.discord.widgets.chat.list.adapter.WidgetChatListAdapter$ScrollToWithHighlight$scheduleRetry$1", f = "WidgetChatListAdapter.kt", l = {431}, m = "invokeSuspend") +@e(c = "com.discord.widgets.chat.list.adapter.WidgetChatListAdapter$ScrollToWithHighlight$scheduleRetry$1", f = "WidgetChatListAdapter.kt", l = {437}, m = "invokeSuspend") public final class WidgetChatListAdapter$ScrollToWithHighlight$scheduleRetry$1 extends k implements Function2, Object> { public int label; public final /* synthetic */ WidgetChatListAdapter.ScrollToWithHighlight this$0; diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$setHandlers$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$setHandlers$1.java index a9690ddb37..322f3f27d3 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$setHandlers$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$setHandlers$1.java @@ -14,12 +14,13 @@ import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; +import kotlinx.coroutines.Job; /* compiled from: WidgetChatListAdapter.kt */ public final class WidgetChatListAdapter$setHandlers$1 extends o implements Function2, List, Unit> { public final /* synthetic */ WidgetChatListAdapter this$0; /* compiled from: WidgetChatListAdapter.kt */ - @e(c = "com.discord.widgets.chat.list.adapter.WidgetChatListAdapter$setHandlers$1$1", f = "WidgetChatListAdapter.kt", l = {113}, m = "invokeSuspend") + @e(c = "com.discord.widgets.chat.list.adapter.WidgetChatListAdapter$setHandlers$1$1", f = "WidgetChatListAdapter.kt", l = {117}, m = "invokeSuspend") /* renamed from: com.discord.widgets.chat.list.adapter.WidgetChatListAdapter$setHandlers$1$1 reason: invalid class name */ public static final class AnonymousClass1 extends k implements Function2, Object> { public int label; @@ -80,11 +81,19 @@ public final class WidgetChatListAdapter$setHandlers$1 extends o implements Func public final void invoke(List list, List list2) { m.checkNotNullParameter(list, ""); m.checkNotNullParameter(list2, ""); - CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(this.this$0.getRecycler()); - if (coroutineScope != null) { - f.F0(coroutineScope, null, null, new AnonymousClass1(this, null), 3, null); + Job access$getLastUpdateJob$p = WidgetChatListAdapter.access$getLastUpdateJob$p(this.this$0); + Job job = null; + if (access$getLastUpdateJob$p != null) { + f.s(access$getLastUpdateJob$p, null, 1, null); } + WidgetChatListAdapter widgetChatListAdapter = this.this$0; + CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(widgetChatListAdapter.getRecycler()); + if (coroutineScope != null) { + job = f.F0(coroutineScope, null, null, new AnonymousClass1(this, null), 3, null); + } + WidgetChatListAdapter.access$setLastUpdateJob$p(widgetChatListAdapter, job); this.this$0.getRecycler().setOnTouchListener(WidgetChatListAdapter.access$getHandlerOfTouches$p(this.this$0)); + this.this$0.getRecycler().removeOnScrollListener(WidgetChatListAdapter.access$getHandlerOfScrolls$p(this.this$0)); this.this$0.getRecycler().addOnScrollListener(WidgetChatListAdapter.access$getHandlerOfScrolls$p(this.this$0)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java index 5820aecabe..44da0240e4 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java @@ -56,6 +56,7 @@ import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.internal.DefaultConstructorMarker; import kotlinx.coroutines.CoroutineScope; +import kotlinx.coroutines.Job; import rx.functions.Action0; /* compiled from: WidgetChatListAdapter.kt */ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple { @@ -73,6 +74,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple= ClockFactory.get().currentTimeMillis() || this.$invite.isRevoked()) ? new WidgetChatListAdapterItemInvite.Model.Invalid(user, id2, channel2) : new WidgetChatListAdapterItemInvite.Model.Resolved(this.$invite, id2, user, z2, channel2, !this.$accessibilityStore.isReducedMotionEnabled()); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java index ce7b050796..ef012e00e7 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java @@ -688,8 +688,8 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter boolean z2; boolean z3; Guild guild; - String w; - String p; + String x2; + String q; List m; ModelInvite component1 = resolved.component1(); long component2 = resolved.component2(); @@ -701,22 +701,22 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter Context context = view.getContext(); boolean z4 = component3 != null && component3.getId() == component2; Guild guild2 = component1.getGuild(); - boolean z5 = (guild2 != null ? guild2.t() : 0) < 200; + boolean z5 = (guild2 != null ? guild2.u() : 0) < 200; Channel channel = component1.getChannel(); - boolean w2 = channel != null ? ChannelUtils.w(channel) : false; + boolean w = channel != null ? ChannelUtils.w(channel) : false; Guild guild3 = component1.getGuild(); boolean z6 = (guild3 == null || (m = guild3.m()) == null || !m.contains(GuildFeature.HUB)) ? false : true; boolean z7 = component1.getChannel() == null && component1.getGuild() == null && component1.getInviter() != null; TextView textView = this.binding.f1844c; m.checkNotNullExpressionValue(textView, "binding.itemInviteHeader"); String str2 = null; - if (w2 && z4) { + if (w && z4) { m.checkNotNullExpressionValue(context, "context"); charSequence = c.a.k.b.h(context, R.string.invite_button_title_inviter_group_dm, new Object[0], null, 4); } else if (z4) { m.checkNotNullExpressionValue(context, "context"); charSequence = c.a.k.b.h(context, R.string.invite_button_title_inviter, new Object[0], null, 4); - } else if (w2 && !z4) { + } else if (w && !z4) { m.checkNotNullExpressionValue(context, "context"); charSequence = c.a.k.b.h(context, R.string.invite_button_title_invited_group_dm, new Object[0], null, 4); } else if (z6) { @@ -740,7 +740,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter textView.setText(charSequence); TextView textView2 = this.binding.m; m.checkNotNullExpressionValue(textView2, "binding.itemInviteName"); - if (w2) { + if (w) { if (component5 != null) { m.checkNotNullExpressionValue(context, "context"); str = ChannelUtils.e(component5, context, false, 2); @@ -757,24 +757,24 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter SimpleDraweeView simpleDraweeView = this.binding.f; m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemInviteImage"); simpleDraweeView.setVisibility(8); - } else if (w2) { + } else if (w) { updateIconUrlIfChanged(IconUtils.getForChannel$default(component1.getChannel(), null, 2, null)); TextView textView3 = this.binding.g; m.checkNotNullExpressionValue(textView3, "binding.itemInviteImageText"); textView3.setVisibility(8); } else { Guild guild4 = component1.getGuild(); - Long valueOf = guild4 != null ? Long.valueOf(guild4.q()) : null; + Long valueOf = guild4 != null ? Long.valueOf(guild4.r()) : null; Guild guild5 = component1.getGuild(); - updateIconUrlIfChanged(IconUtils.getForGuild$default(valueOf, guild5 != null ? guild5.p() : null, IconUtils.DEFAULT_ICON_BLURPLE, resolved.getShouldAnimateGuildIcon(), null, 16, null)); + updateIconUrlIfChanged(IconUtils.getForGuild$default(valueOf, guild5 != null ? guild5.q() : null, IconUtils.DEFAULT_ICON_BLURPLE, resolved.getShouldAnimateGuildIcon(), null, 16, null)); Guild guild6 = component1.getGuild(); - if (!(guild6 == null || (p = guild6.p()) == null)) { - if (p.length() > 0) { + if (!(guild6 == null || (q = guild6.q()) == null)) { + if (q.length() > 0) { z3 = true; TextView textView4 = this.binding.g; m.checkNotNullExpressionValue(textView4, "binding.itemInviteImageText"); - if (!(z3 || (guild = component1.getGuild()) == null || (w = guild.w()) == null)) { - str2 = GuildUtilsKt.computeShortName(w); + if (!(z3 || (guild = component1.getGuild()) == null || (x2 = guild.x()) == null)) { + str2 = GuildUtilsKt.computeShortName(x2); } ViewExtensions.setTextAndVisibilityBy(textView4, str2); } @@ -782,16 +782,16 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter z3 = false; TextView textView4 = this.binding.g; m.checkNotNullExpressionValue(textView4, "binding.itemInviteImageText"); - str2 = GuildUtilsKt.computeShortName(w); + str2 = GuildUtilsKt.computeShortName(x2); ViewExtensions.setTextAndVisibilityBy(textView4, str2); } if (component5 == null && ChannelUtils.t(component5)) { m.checkNotNullExpressionValue(context, "context"); configureForVocalChannel(component5, context); } else { - configureForTextChannel(w2, component1); + configureForTextChannel(w, component1); } - if (w2) { + if (w) { component4 = component5 != null; } z2 = !z6 && GrowthTeamFeatures.INSTANCE.isHubEmailConnectionEnabled(); @@ -827,7 +827,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter } else { Guild guild7 = component1.getGuild(); if (guild7 != null) { - str = guild7.w(); + str = guild7.x(); textView2.setText(str); this.binding.m.setTextColor(ColorCompat.getThemedColor(context, (int) R.attr.primary_100)); this.binding.m.setBackgroundResource(0); @@ -836,8 +836,8 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter } if (component5 == null) { } - configureForTextChannel(w2, component1); - if (w2) { + configureForTextChannel(w, component1); + if (w) { } if (!z6) { } @@ -873,8 +873,8 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter } if (component5 == null) { } - configureForTextChannel(w2, component1); - if (w2) { + configureForTextChannel(w, component1); + if (w) { } if (!z6) { } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite$configureUI$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite$configureUI$2.java index f24d729d29..e536ece502 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite$configureUI$2.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite$configureUI$2.java @@ -91,7 +91,7 @@ public final class WidgetChatListAdapterItemStageInvite$configureUI$2 implements long f; Guild guild = this.$model.getInvite().getGuild(); if (guild != null) { - f = guild.q(); + f = guild.r(); } else { Channel channel = this.$model.getChannel(); if (channel != null) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java index 9a9a34a919..f88c6e2dc5 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java @@ -378,28 +378,28 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd Integer listenersCount; int size; Guild guild; - String w; - String p; + String x2; + String q; View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); Context context = view.getContext(); Guild guild2 = model.getInvite().getGuild(); String str3 = null; - Long valueOf = guild2 != null ? Long.valueOf(guild2.q()) : null; + Long valueOf = guild2 != null ? Long.valueOf(guild2.r()) : null; Guild guild3 = model.getInvite().getGuild(); - updateIconUrlIfChanged(IconUtils.getForGuild$default(valueOf, guild3 != null ? guild3.p() : null, IconUtils.DEFAULT_ICON_BLURPLE, model.getShouldAnimateGuildIcon(), null, 16, null)); + updateIconUrlIfChanged(IconUtils.getForGuild$default(valueOf, guild3 != null ? guild3.q() : null, IconUtils.DEFAULT_ICON_BLURPLE, model.getShouldAnimateGuildIcon(), null, 16, null)); Guild guild4 = model.getInvite().getGuild(); int i = 0; - if (!(guild4 == null || (p = guild4.p()) == null)) { - if (p.length() > 0) { + if (!(guild4 == null || (q = guild4.q()) == null)) { + if (q.length() > 0) { z2 = true; TextView textView = this.binding.e; m.checkNotNullExpressionValue(textView, "binding.itemInviteImageText"); - ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (w = guild.w()) == null) ? null : GuildUtilsKt.computeShortName(w)); + ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (x2 = guild.x()) == null) ? null : GuildUtilsKt.computeShortName(x2)); TextView textView2 = this.binding.f1850c; m.checkNotNullExpressionValue(textView2, "binding.itemInviteGuildName"); Guild guild5 = model.getInvite().getGuild(); - if (guild5 == null || (str = guild5.w()) == null) { + if (guild5 == null || (str = guild5.x()) == null) { Channel channel = model.getChannel(); str = channel != null ? channel.m() : null; } @@ -466,7 +466,7 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd TextView textView = this.binding.e; m.checkNotNullExpressionValue(textView, "binding.itemInviteImageText"); if (z2) { - ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (w = guild.w()) == null) ? null : GuildUtilsKt.computeShortName(w)); + ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (x2 = guild.x()) == null) ? null : GuildUtilsKt.computeShortName(x2)); TextView textView2 = this.binding.f1850c; m.checkNotNullExpressionValue(textView2, "binding.itemInviteGuildName"); Guild guild5 = model.getInvite().getGuild(); @@ -508,7 +508,7 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd stageCardSpeakersView.l.setData(arrayList2); this.binding.f.setOnClickListener(new WidgetChatListAdapterItemStageInvite$configureUI$2(this, model, context)); } - ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (w = guild.w()) == null) ? null : GuildUtilsKt.computeShortName(w)); + ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (x2 = guild.x()) == null) ? null : GuildUtilsKt.computeShortName(x2)); TextView textView2 = this.binding.f1850c; m.checkNotNullExpressionValue(textView2, "binding.itemInviteGuildName"); Guild guild5 = model.getInvite().getGuild(); diff --git a/app/src/main/java/com/discord/widgets/directories/DirectoryChannelItemClickInterface.java b/app/src/main/java/com/discord/widgets/directories/DirectoryChannelItemClickInterface.java index 1a8e9b74be..b74401861d 100644 --- a/app/src/main/java/com/discord/widgets/directories/DirectoryChannelItemClickInterface.java +++ b/app/src/main/java/com/discord/widgets/directories/DirectoryChannelItemClickInterface.java @@ -1,6 +1,6 @@ package com.discord.widgets.directories; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; /* compiled from: WidgetDirectoryEntryViewHolder.kt */ public interface DirectoryChannelItemClickInterface { @@ -16,5 +16,5 @@ public interface DirectoryChannelItemClickInterface { void onGoToGuildClicked(long j); - void onOverflowClicked(DirectoryEntry directoryEntry, long j, boolean z2); + void onOverflowClicked(DirectoryEntryGuild directoryEntryGuild, long j, boolean z2); } diff --git a/app/src/main/java/com/discord/widgets/directories/DirectoryEntryData.java b/app/src/main/java/com/discord/widgets/directories/DirectoryEntryData.java index c4bbff5dab..15ddaa15a2 100644 --- a/app/src/main/java/com/discord/widgets/directories/DirectoryEntryData.java +++ b/app/src/main/java/com/discord/widgets/directories/DirectoryEntryData.java @@ -1,24 +1,24 @@ package com.discord.widgets.directories; import c.d.b.a.a; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import d0.z.d.m; /* compiled from: WidgetDirectoryEntryViewHolder.kt */ public final class DirectoryEntryData { - private final DirectoryEntry entry; + private final DirectoryEntryGuild entry; private final boolean hasEditPermissions; private final boolean hasJoinedGuild; - public DirectoryEntryData(DirectoryEntry directoryEntry, boolean z2, boolean z3) { - m.checkNotNullParameter(directoryEntry, "entry"); - this.entry = directoryEntry; + public DirectoryEntryData(DirectoryEntryGuild directoryEntryGuild, boolean z2, boolean z3) { + m.checkNotNullParameter(directoryEntryGuild, "entry"); + this.entry = directoryEntryGuild; this.hasJoinedGuild = z2; this.hasEditPermissions = z3; } - public static /* synthetic */ DirectoryEntryData copy$default(DirectoryEntryData directoryEntryData, DirectoryEntry directoryEntry, boolean z2, boolean z3, int i, Object obj) { + public static /* synthetic */ DirectoryEntryData copy$default(DirectoryEntryData directoryEntryData, DirectoryEntryGuild directoryEntryGuild, boolean z2, boolean z3, int i, Object obj) { if ((i & 1) != 0) { - directoryEntry = directoryEntryData.entry; + directoryEntryGuild = directoryEntryData.entry; } if ((i & 2) != 0) { z2 = directoryEntryData.hasJoinedGuild; @@ -26,10 +26,10 @@ public final class DirectoryEntryData { if ((i & 4) != 0) { z3 = directoryEntryData.hasEditPermissions; } - return directoryEntryData.copy(directoryEntry, z2, z3); + return directoryEntryData.copy(directoryEntryGuild, z2, z3); } - public final DirectoryEntry component1() { + public final DirectoryEntryGuild component1() { return this.entry; } @@ -41,9 +41,9 @@ public final class DirectoryEntryData { return this.hasEditPermissions; } - public final DirectoryEntryData copy(DirectoryEntry directoryEntry, boolean z2, boolean z3) { - m.checkNotNullParameter(directoryEntry, "entry"); - return new DirectoryEntryData(directoryEntry, z2, z3); + public final DirectoryEntryData copy(DirectoryEntryGuild directoryEntryGuild, boolean z2, boolean z3) { + m.checkNotNullParameter(directoryEntryGuild, "entry"); + return new DirectoryEntryData(directoryEntryGuild, z2, z3); } public boolean equals(Object obj) { @@ -57,7 +57,7 @@ public final class DirectoryEntryData { return m.areEqual(this.entry, directoryEntryData.entry) && this.hasJoinedGuild == directoryEntryData.hasJoinedGuild && this.hasEditPermissions == directoryEntryData.hasEditPermissions; } - public final DirectoryEntry getEntry() { + public final DirectoryEntryGuild getEntry() { return this.entry; } @@ -70,8 +70,8 @@ public final class DirectoryEntryData { } public int hashCode() { - DirectoryEntry directoryEntry = this.entry; - int hashCode = (directoryEntry != null ? directoryEntry.hashCode() : 0) * 31; + DirectoryEntryGuild directoryEntryGuild = this.entry; + int hashCode = (directoryEntryGuild != null ? directoryEntryGuild.hashCode() : 0) * 31; boolean z2 = this.hasJoinedGuild; int i = 1; if (z2) { diff --git a/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder$bind$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder$bind$$inlined$apply$lambda$1.java index ff7307383d..7769af8342 100644 --- a/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder$bind$$inlined$apply$lambda$1.java +++ b/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder$bind$$inlined$apply$lambda$1.java @@ -1,15 +1,15 @@ package com.discord.widgets.directories; import android.view.View; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; /* compiled from: WidgetDirectoryEntryViewHolder.kt */ public final class DirectoryEntryViewHolder$bind$$inlined$apply$lambda$1 implements View.OnClickListener { - public final /* synthetic */ DirectoryEntry $data$inlined; + public final /* synthetic */ DirectoryEntryGuild $data$inlined; public final /* synthetic */ DirectoryEntryData $entryData$inlined; public final /* synthetic */ DirectoryChannelItemClickInterface $listener$inlined; - public DirectoryEntryViewHolder$bind$$inlined$apply$lambda$1(DirectoryEntry directoryEntry, DirectoryEntryData directoryEntryData, DirectoryChannelItemClickInterface directoryChannelItemClickInterface) { - this.$data$inlined = directoryEntry; + public DirectoryEntryViewHolder$bind$$inlined$apply$lambda$1(DirectoryEntryGuild directoryEntryGuild, DirectoryEntryData directoryEntryData, DirectoryChannelItemClickInterface directoryChannelItemClickInterface) { + this.$data$inlined = directoryEntryGuild; this.$entryData$inlined = directoryEntryData; this.$listener$inlined = directoryChannelItemClickInterface; } diff --git a/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder$bind$$inlined$apply$lambda$2.java b/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder$bind$$inlined$apply$lambda$2.java index 424f912ab0..3fcffa4fef 100644 --- a/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder$bind$$inlined$apply$lambda$2.java +++ b/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder$bind$$inlined$apply$lambda$2.java @@ -1,15 +1,15 @@ package com.discord.widgets.directories; import android.view.View; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; /* compiled from: WidgetDirectoryEntryViewHolder.kt */ public final class DirectoryEntryViewHolder$bind$$inlined$apply$lambda$2 implements View.OnClickListener { - public final /* synthetic */ DirectoryEntry $data$inlined; + public final /* synthetic */ DirectoryEntryGuild $data$inlined; public final /* synthetic */ DirectoryEntryData $entryData$inlined; public final /* synthetic */ DirectoryChannelItemClickInterface $listener$inlined; - public DirectoryEntryViewHolder$bind$$inlined$apply$lambda$2(DirectoryEntry directoryEntry, DirectoryEntryData directoryEntryData, DirectoryChannelItemClickInterface directoryChannelItemClickInterface) { - this.$data$inlined = directoryEntry; + public DirectoryEntryViewHolder$bind$$inlined$apply$lambda$2(DirectoryEntryGuild directoryEntryGuild, DirectoryEntryData directoryEntryData, DirectoryChannelItemClickInterface directoryChannelItemClickInterface) { + this.$data$inlined = directoryEntryGuild; this.$entryData$inlined = directoryEntryData; this.$listener$inlined = directoryChannelItemClickInterface; } diff --git a/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder$bind$$inlined$apply$lambda$3.java b/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder$bind$$inlined$apply$lambda$3.java index 066e651e0f..c01b11e559 100644 --- a/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder$bind$$inlined$apply$lambda$3.java +++ b/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder$bind$$inlined$apply$lambda$3.java @@ -1,15 +1,15 @@ package com.discord.widgets.directories; import android.view.View; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; /* compiled from: WidgetDirectoryEntryViewHolder.kt */ public final class DirectoryEntryViewHolder$bind$$inlined$apply$lambda$3 implements View.OnLongClickListener { - public final /* synthetic */ DirectoryEntry $data$inlined; + public final /* synthetic */ DirectoryEntryGuild $data$inlined; public final /* synthetic */ DirectoryEntryData $entryData$inlined; public final /* synthetic */ DirectoryChannelItemClickInterface $listener$inlined; - public DirectoryEntryViewHolder$bind$$inlined$apply$lambda$3(DirectoryEntry directoryEntry, DirectoryEntryData directoryEntryData, DirectoryChannelItemClickInterface directoryChannelItemClickInterface) { - this.$data$inlined = directoryEntry; + public DirectoryEntryViewHolder$bind$$inlined$apply$lambda$3(DirectoryEntryGuild directoryEntryGuild, DirectoryEntryData directoryEntryData, DirectoryChannelItemClickInterface directoryChannelItemClickInterface) { + this.$data$inlined = directoryEntryGuild; this.$entryData$inlined = directoryEntryData; this.$listener$inlined = directoryChannelItemClickInterface; } @@ -17,8 +17,8 @@ public final class DirectoryEntryViewHolder$bind$$inlined$apply$lambda$3 impleme @Override // android.view.View.OnLongClickListener public final boolean onLongClick(View view) { DirectoryChannelItemClickInterface directoryChannelItemClickInterface = this.$listener$inlined; - DirectoryEntry directoryEntry = this.$data$inlined; - directoryChannelItemClickInterface.onOverflowClicked(directoryEntry, directoryEntry.c(), this.$entryData$inlined.getHasEditPermissions()); + DirectoryEntryGuild directoryEntryGuild = this.$data$inlined; + directoryChannelItemClickInterface.onOverflowClicked(directoryEntryGuild, directoryEntryGuild.c(), this.$entryData$inlined.getHasEditPermissions()); return true; } } diff --git a/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder.java b/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder.java index 7e8ef479a1..fa86f76779 100644 --- a/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder.java +++ b/app/src/main/java/com/discord/widgets/directories/DirectoryEntryViewHolder.java @@ -1,6 +1,6 @@ package com.discord.widgets.directories; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.databinding.DirectoryEntryListItemBinding; import com.discord.utilities.guilds.GuildUtilsKt; import com.discord.utilities.icon.IconUtils; @@ -30,7 +30,7 @@ public final class DirectoryEntryViewHolder extends DirectoryChannelViewHolder { } DirectoryChannelItem.DirectoryItem directoryItem = (DirectoryChannelItem.DirectoryItem) directoryChannelItem; if (directoryItem != null && (directoryEntryData = directoryItem.getDirectoryEntryData()) != null) { - DirectoryEntry entry = directoryEntryData.getEntry(); + DirectoryEntryGuild entry = directoryEntryData.getEntry(); ServerDiscoveryItem serverDiscoveryItem = this.viewBinding.b; serverDiscoveryItem.setTitle(entry.e().i()); serverDiscoveryItem.setDescription(entry.b()); diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$adapter$1$onOverflowClicked$1.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$adapter$1$onOverflowClicked$1.java index 3867dfc6f4..26c0fad328 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$adapter$1$onOverflowClicked$1.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$adapter$1$onOverflowClicked$1.java @@ -1,20 +1,20 @@ package com.discord.widgets.directories; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: WidgetDirectoriesSearch.kt */ public final class WidgetDirectoriesSearch$adapter$1$onOverflowClicked$1 extends o implements Function0 { public final /* synthetic */ long $channelId; - public final /* synthetic */ DirectoryEntry $directoryEntry; + public final /* synthetic */ DirectoryEntryGuild $directoryEntry; public final /* synthetic */ WidgetDirectoriesSearch$adapter$1 this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetDirectoriesSearch$adapter$1$onOverflowClicked$1(WidgetDirectoriesSearch$adapter$1 widgetDirectoriesSearch$adapter$1, DirectoryEntry directoryEntry, long j) { + public WidgetDirectoriesSearch$adapter$1$onOverflowClicked$1(WidgetDirectoriesSearch$adapter$1 widgetDirectoriesSearch$adapter$1, DirectoryEntryGuild directoryEntryGuild, long j) { super(0); this.this$0 = widgetDirectoriesSearch$adapter$1; - this.$directoryEntry = directoryEntry; + this.$directoryEntry = directoryEntryGuild; this.$channelId = j; } diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$adapter$1.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$adapter$1.java index f29cc68be2..c7e3116ca3 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$adapter$1.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$adapter$1.java @@ -2,7 +2,7 @@ package com.discord.widgets.directories; import android.content.Context; import androidx.fragment.app.FragmentActivity; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.stores.StoreStream; import com.discord.utilities.directories.DirectoryUtils; import com.discord.widgets.directories.DirectoryChannelItemClickInterface; @@ -40,10 +40,10 @@ public final class WidgetDirectoriesSearch$adapter$1 implements DirectoryChannel } @Override // com.discord.widgets.directories.DirectoryChannelItemClickInterface - public void onOverflowClicked(DirectoryEntry directoryEntry, long j, boolean z2) { - m.checkNotNullParameter(directoryEntry, "directoryEntry"); + public void onOverflowClicked(DirectoryEntryGuild directoryEntryGuild, long j, boolean z2) { + m.checkNotNullParameter(directoryEntryGuild, "directoryEntry"); DirectoryUtils directoryUtils = DirectoryUtils.INSTANCE; WidgetDirectoriesSearch widgetDirectoriesSearch = this.this$0; - directoryUtils.showServerOptions(widgetDirectoriesSearch, directoryEntry, widgetDirectoriesSearch.getViewModel().getHubName(), z2, new WidgetDirectoriesSearch$adapter$1$onOverflowClicked$1(this, directoryEntry, j)); + directoryUtils.showServerOptions(widgetDirectoriesSearch, directoryEntryGuild, widgetDirectoriesSearch.getViewModel().getHubName(), z2, new WidgetDirectoriesSearch$adapter$1$onOverflowClicked$1(this, directoryEntryGuild, j)); } } diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearchViewModel$ViewState$directoryEntryData$2.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearchViewModel$ViewState$directoryEntryData$2.java index 35a28e6ab5..4a6b47944c 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearchViewModel$ViewState$directoryEntryData$2.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearchViewModel$ViewState$directoryEntryData$2.java @@ -1,6 +1,6 @@ package com.discord.widgets.directories; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.widgets.directories.WidgetDirectoriesSearchViewModel; import d0.z.d.o; import java.util.ArrayList; @@ -20,10 +20,10 @@ public final class WidgetDirectoriesSearchViewModel$ViewState$directoryEntryData @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final List mo1invoke() { - List directories = this.this$0.getDirectories(); + List directories = this.this$0.getDirectories(); ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(directories, 10)); - for (DirectoryEntry directoryEntry : directories) { - arrayList.add(new DirectoryEntryData(directoryEntry, this.this$0.getJoinedGuildIds().contains(Long.valueOf(directoryEntry.e().h())), this.this$0.getAdminGuildIds().contains(Long.valueOf(directoryEntry.e().h())))); + for (DirectoryEntryGuild directoryEntryGuild : directories) { + arrayList.add(new DirectoryEntryData(directoryEntryGuild, this.this$0.getJoinedGuildIds().contains(Long.valueOf(directoryEntryGuild.e().h())), this.this$0.getAdminGuildIds().contains(Long.valueOf(directoryEntryGuild.e().h())))); } return arrayList; } diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearchViewModel$searchForDirectories$1.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearchViewModel$searchForDirectories$1.java index 6e5bd45fba..a28d372e58 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearchViewModel$searchForDirectories$1.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearchViewModel$searchForDirectories$1.java @@ -1,6 +1,6 @@ package com.discord.widgets.directories; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.stores.utilities.RestCallState; import com.discord.widgets.directories.WidgetDirectoriesSearchViewModel; import d0.z.d.m; @@ -9,7 +9,7 @@ import java.util.List; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetDirectoriesSearchViewModel.kt */ -public final class WidgetDirectoriesSearchViewModel$searchForDirectories$1 extends o implements Function1>, Unit> { +public final class WidgetDirectoriesSearchViewModel$searchForDirectories$1 extends o implements Function1>, Unit> { public final /* synthetic */ CharSequence $query; public final /* synthetic */ WidgetDirectoriesSearchViewModel.ViewState $viewState; public final /* synthetic */ WidgetDirectoriesSearchViewModel this$0; @@ -25,17 +25,17 @@ public final class WidgetDirectoriesSearchViewModel$searchForDirectories$1 exten /* Return type fixed from 'java.lang.Object' to match base method */ /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(RestCallState> restCallState) { - invoke((RestCallState>) restCallState); + public /* bridge */ /* synthetic */ Unit invoke(RestCallState> restCallState) { + invoke((RestCallState>) restCallState); return Unit.a; } - public final void invoke(RestCallState> restCallState) { + public final void invoke(RestCallState> restCallState) { m.checkNotNullParameter(restCallState, "entriesState"); WidgetDirectoriesSearchViewModel widgetDirectoriesSearchViewModel = this.this$0; WidgetDirectoriesSearchViewModel.ViewState viewState = this.$viewState; String obj = this.$query.toString(); - List list = (List) restCallState.invoke(); + List list = (List) restCallState.invoke(); if (list == null) { list = this.$viewState.getDirectories(); } diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearchViewModel.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearchViewModel.java index 038308fd5b..aa607df3b2 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearchViewModel.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearchViewModel.java @@ -2,7 +2,7 @@ package com.discord.widgets.directories; import android.content.Context; import c.d.b.a.a; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.app.AppViewModel; import com.discord.models.guild.Guild; import com.discord.stores.StoreChannels; @@ -85,8 +85,8 @@ public final class WidgetDirectoriesSearchViewModel extends AppViewModel adminGuildIds; private final String currentSearchTerm; - private final List directories; - private final RestCallState> directoriesState; + private final List directories; + private final RestCallState> directoriesState; private final Lazy directoryEntryData$delegate; private final Guild guild; private final boolean hasAddGuildPermissions; @@ -96,9 +96,9 @@ public final class WidgetDirectoriesSearchViewModel extends AppViewModel> */ + /* JADX DEBUG: Multi-variable search result rejected for r8v0, resolved type: com.discord.stores.utilities.RestCallState> */ /* JADX WARN: Multi-variable type inference failed */ - public ViewState(Guild guild, String str, List list, Set set, Set set2, boolean z2, RestCallState> restCallState) { + public ViewState(Guild guild, String str, List list, Set set, Set set2, boolean z2, RestCallState> restCallState) { m.checkNotNullParameter(str, "currentSearchTerm"); m.checkNotNullParameter(list, "directories"); m.checkNotNullParameter(set, "joinedGuildIds"); @@ -154,7 +154,7 @@ public final class WidgetDirectoriesSearchViewModel extends AppViewModel component3() { + public final List component3() { return this.directories; } @@ -170,11 +170,11 @@ public final class WidgetDirectoriesSearchViewModel extends AppViewModel> component7() { + public final RestCallState> component7() { return this.directoriesState; } - public final ViewState copy(Guild guild, String str, List list, Set set, Set set2, boolean z2, RestCallState> restCallState) { + public final ViewState copy(Guild guild, String str, List list, Set set, Set set2, boolean z2, RestCallState> restCallState) { m.checkNotNullParameter(str, "currentSearchTerm"); m.checkNotNullParameter(list, "directories"); m.checkNotNullParameter(set, "joinedGuildIds"); @@ -202,11 +202,11 @@ public final class WidgetDirectoriesSearchViewModel extends AppViewModel getDirectories() { + public final List getDirectories() { return this.directories; } - public final RestCallState> getDirectoriesState() { + public final RestCallState> getDirectoriesState() { return this.directoriesState; } @@ -232,7 +232,7 @@ public final class WidgetDirectoriesSearchViewModel extends AppViewModel list = this.directories; + List list = this.directories; int hashCode3 = (hashCode2 + (list != null ? list.hashCode() : 0)) * 31; Set set = this.joinedGuildIds; int hashCode4 = (hashCode3 + (set != null ? set.hashCode() : 0)) * 31; @@ -246,7 +246,7 @@ public final class WidgetDirectoriesSearchViewModel extends AppViewModel> restCallState = this.directoriesState; + RestCallState> restCallState = this.directoriesState; if (restCallState != null) { i = restCallState.hashCode(); } diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$Companion$observeStores$1.java index a1180cdc71..50837cfad5 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$Companion$observeStores$1.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$Companion$observeStores$1.java @@ -2,7 +2,7 @@ package com.discord.widgets.directories; import c.d.b.a.a; import com.discord.api.channel.Channel; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.api.permission.Permission; import com.discord.models.guild.Guild; import com.discord.stores.StoreChannelsSelected; @@ -43,7 +43,7 @@ public final class WidgetDirectoriesViewModel$Companion$observeStores$1 extends @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final WidgetDirectoriesViewModel.ViewState mo1invoke() { - RestCallState> restCallState; + RestCallState> restCallState; RestCallState> restCallState2; Channel selectedChannel = this.$channelsSelectedStore.getSelectedChannel(); Guild guild = this.$guildsStore.getGuild(this.$guildSelectedStore.getSelectedGuildId()); diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$ViewState$allDirectoryEntryData$2.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$ViewState$allDirectoryEntryData$2.java index 9ca65232cc..add3a702c0 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$ViewState$allDirectoryEntryData$2.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$ViewState$allDirectoryEntryData$2.java @@ -1,6 +1,6 @@ package com.discord.widgets.directories; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.widgets.directories.WidgetDirectoriesViewModel; import d0.t.n; import d0.z.d.o; @@ -21,13 +21,13 @@ public final class WidgetDirectoriesViewModel$ViewState$allDirectoryEntryData$2 @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final List mo1invoke() { - List invoke = this.this$0.getDirectories().invoke(); + List invoke = this.this$0.getDirectories().invoke(); if (invoke == null) { invoke = n.emptyList(); } ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(invoke, 10)); - for (DirectoryEntry directoryEntry : invoke) { - arrayList.add(new DirectoryEntryData(directoryEntry, this.this$0.getJoinedGuildIds().contains(Long.valueOf(directoryEntry.e().h())), this.this$0.getAdminGuildIds().contains(Long.valueOf(directoryEntry.e().h())))); + for (DirectoryEntryGuild directoryEntryGuild : invoke) { + arrayList.add(new DirectoryEntryData(directoryEntryGuild, this.this$0.getJoinedGuildIds().contains(Long.valueOf(directoryEntryGuild.e().h())), this.this$0.getAdminGuildIds().contains(Long.valueOf(directoryEntryGuild.e().h())))); } return arrayList; } diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$ViewState$directoryEntryData$2.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$ViewState$directoryEntryData$2.java index 6d628c4347..7bc04e8004 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$ViewState$directoryEntryData$2.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$ViewState$directoryEntryData$2.java @@ -1,6 +1,6 @@ package com.discord.widgets.directories; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.models.hubs.DirectoryEntryCategory; import com.discord.utilities.directories.DirectoryUtilsKt; import com.discord.utilities.features.GrowthTeamFeatures; @@ -27,19 +27,19 @@ public final class WidgetDirectoriesViewModel$ViewState$directoryEntryData$2 ext @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Map> mo1invoke() { - List invoke = this.this$0.getDirectories().invoke(); + List invoke = this.this$0.getDirectories().invoke(); if (invoke == null) { invoke = n.emptyList(); } LinkedHashMap linkedHashMap = new LinkedHashMap(); - for (DirectoryEntry directoryEntry : invoke) { - Integer valueOf = Integer.valueOf(directoryEntry.f()); + for (DirectoryEntryGuild directoryEntryGuild : invoke) { + Integer valueOf = Integer.valueOf(directoryEntryGuild.f()); Object obj = linkedHashMap.get(valueOf); if (obj == null) { obj = new ArrayList(); linkedHashMap.put(valueOf, obj); } - ((List) obj).add(new DirectoryEntryData(directoryEntry, this.this$0.getJoinedGuildIds().contains(Long.valueOf(directoryEntry.e().h())), this.this$0.getAdminGuildIds().contains(Long.valueOf(directoryEntry.e().h())))); + ((List) obj).add(new DirectoryEntryData(directoryEntryGuild, this.this$0.getJoinedGuildIds().contains(Long.valueOf(directoryEntryGuild.e().h())), this.this$0.getAdminGuildIds().contains(Long.valueOf(directoryEntryGuild.e().h())))); } if (!GrowthTeamFeatures.INSTANCE.hubRankingsEnabled()) { return linkedHashMap; diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel.java index 30107146f7..d35612c58b 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel.java @@ -4,7 +4,7 @@ import android.content.Context; import c.d.b.a.a; import com.discord.api.channel.Channel; import com.discord.api.channel.ChannelUtils; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.app.AppViewModel; import com.discord.models.domain.ModelAuditLogEntry; import com.discord.models.guild.Guild; @@ -192,7 +192,7 @@ public final class WidgetDirectoriesViewModel extends AppViewModel { private final Set adminGuildIds; private final Lazy allDirectoryEntryData$delegate; private final Channel channel; - private final RestCallState> directories; + private final RestCallState> directories; private final Lazy directoryEntryData$delegate; private final Guild guild; private final boolean hasAddGuildPermissions; @@ -204,10 +204,10 @@ public final class WidgetDirectoriesViewModel extends AppViewModel { this(null, null, null, null, false, null, null, 127, null); } - /* JADX DEBUG: Multi-variable search result rejected for r7v0, resolved type: com.discord.stores.utilities.RestCallState> */ + /* JADX DEBUG: Multi-variable search result rejected for r7v0, resolved type: com.discord.stores.utilities.RestCallState> */ /* JADX DEBUG: Multi-variable search result rejected for r8v0, resolved type: com.discord.stores.utilities.RestCallState> */ /* JADX WARN: Multi-variable type inference failed */ - public ViewState(Guild guild, Channel channel, Set set, Set set2, boolean z2, RestCallState> restCallState, RestCallState> restCallState2) { + public ViewState(Guild guild, Channel channel, Set set, Set set2, boolean z2, RestCallState> restCallState, RestCallState> restCallState2) { m.checkNotNullParameter(set, "joinedGuildIds"); m.checkNotNullParameter(set2, "adminGuildIds"); m.checkNotNullParameter(restCallState, "directories"); @@ -276,7 +276,7 @@ public final class WidgetDirectoriesViewModel extends AppViewModel { return this.hasAddGuildPermissions; } - public final RestCallState> component6() { + public final RestCallState> component6() { return this.directories; } @@ -284,7 +284,7 @@ public final class WidgetDirectoriesViewModel extends AppViewModel { return this.tabs; } - public final ViewState copy(Guild guild, Channel channel, Set set, Set set2, boolean z2, RestCallState> restCallState, RestCallState> restCallState2) { + public final ViewState copy(Guild guild, Channel channel, Set set, Set set2, boolean z2, RestCallState> restCallState, RestCallState> restCallState2) { m.checkNotNullParameter(set, "joinedGuildIds"); m.checkNotNullParameter(set2, "adminGuildIds"); m.checkNotNullParameter(restCallState, "directories"); @@ -315,7 +315,7 @@ public final class WidgetDirectoriesViewModel extends AppViewModel { return this.channel; } - public final RestCallState> getDirectories() { + public final RestCallState> getDirectories() { return this.directories; } @@ -361,7 +361,7 @@ public final class WidgetDirectoriesViewModel extends AppViewModel { int i3 = z2 ? 1 : 0; int i4 = z2 ? 1 : 0; int i5 = (hashCode4 + i2) * 31; - RestCallState> restCallState = this.directories; + RestCallState> restCallState = this.directories; int hashCode5 = (i5 + (restCallState != null ? restCallState.hashCode() : 0)) * 31; RestCallState> restCallState2 = this.tabs; if (restCallState2 != null) { diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory$adapter$1$onOverflowClicked$1.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory$adapter$1$onOverflowClicked$1.java index 51b9e8b149..b50476634d 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory$adapter$1$onOverflowClicked$1.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory$adapter$1$onOverflowClicked$1.java @@ -1,20 +1,20 @@ package com.discord.widgets.directories; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: WidgetDirectoryCategory.kt */ public final class WidgetDirectoryCategory$adapter$1$onOverflowClicked$1 extends o implements Function0 { public final /* synthetic */ long $channelId; - public final /* synthetic */ DirectoryEntry $directoryEntry; + public final /* synthetic */ DirectoryEntryGuild $directoryEntry; public final /* synthetic */ WidgetDirectoryCategory$adapter$1 this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetDirectoryCategory$adapter$1$onOverflowClicked$1(WidgetDirectoryCategory$adapter$1 widgetDirectoryCategory$adapter$1, DirectoryEntry directoryEntry, long j) { + public WidgetDirectoryCategory$adapter$1$onOverflowClicked$1(WidgetDirectoryCategory$adapter$1 widgetDirectoryCategory$adapter$1, DirectoryEntryGuild directoryEntryGuild, long j) { super(0); this.this$0 = widgetDirectoryCategory$adapter$1; - this.$directoryEntry = directoryEntry; + this.$directoryEntry = directoryEntryGuild; this.$channelId = j; } diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory$adapter$1.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory$adapter$1.java index 03ef65dab8..9da4662be9 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory$adapter$1.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory$adapter$1.java @@ -2,7 +2,7 @@ package com.discord.widgets.directories; import android.content.Context; import c.a.d.j; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.stores.StoreStream; import com.discord.utilities.directories.DirectoryUtils; import com.discord.widgets.hubs.WidgetHubAddServer; @@ -38,10 +38,10 @@ public final class WidgetDirectoryCategory$adapter$1 implements DirectoryChannel } @Override // com.discord.widgets.directories.DirectoryChannelItemClickInterface - public void onOverflowClicked(DirectoryEntry directoryEntry, long j, boolean z2) { - m.checkNotNullParameter(directoryEntry, "directoryEntry"); + public void onOverflowClicked(DirectoryEntryGuild directoryEntryGuild, long j, boolean z2) { + m.checkNotNullParameter(directoryEntryGuild, "directoryEntry"); DirectoryUtils directoryUtils = DirectoryUtils.INSTANCE; WidgetDirectoryCategory widgetDirectoryCategory = this.this$0; - directoryUtils.showServerOptions(widgetDirectoryCategory, directoryEntry, widgetDirectoryCategory.getViewModel().getHubName(), z2, new WidgetDirectoryCategory$adapter$1$onOverflowClicked$1(this, directoryEntry, j)); + directoryUtils.showServerOptions(widgetDirectoryCategory, directoryEntryGuild, widgetDirectoryCategory.getViewModel().getHubName(), z2, new WidgetDirectoryCategory$adapter$1$onOverflowClicked$1(this, directoryEntryGuild, j)); } } diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java index e22a676c30..67223720d7 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java @@ -17,7 +17,7 @@ import c.a.k.b; import c.a.o.b; import c.d.b.a.a; import com.discord.R; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.app.AppFragment; import com.discord.databinding.WidgetDirectoryChannelBinding; import com.discord.models.guild.Guild; @@ -114,7 +114,7 @@ public final class WidgetDirectoryChannel extends AppFragment { } ServerDiscoveryHeader serverDiscoveryHeader = getBinding().f1873c; serverDiscoveryHeader.setButtonOnClickListener(new WidgetDirectoryChannel$configureUi$$inlined$apply$lambda$1(serverDiscoveryHeader, viewState)); - List invoke = viewState.getDirectories().invoke(); + List invoke = viewState.getDirectories().invoke(); boolean z2 = invoke != null && (invoke.isEmpty() ^ true); ServerDiscoveryHeader serverDiscoveryHeader2 = getBinding().f1873c; m.checkNotNullExpressionValue(serverDiscoveryHeader2, "binding.header"); diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java index 69ccafe7cf..069ee706ab 100644 --- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java +++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java @@ -127,11 +127,11 @@ public final class WidgetGuildClone extends WidgetGuildCreate { list = n.emptyList(); } guildTemplateChannelsView.updateView(list); - List F = serializedSourceGuild.F(); - if (F == null) { - F = n.emptyList(); + List G = serializedSourceGuild.G(); + if (G == null) { + G = n.emptyList(); } - List sortedWith = u.sortedWith(F, new WidgetGuildClone$configureUI$$inlined$sortedBy$2()); + List sortedWith = u.sortedWith(G, new WidgetGuildClone$configureUI$$inlined$sortedBy$2()); ArrayList arrayList = new ArrayList(); for (Object obj : sortedWith) { if (!m.areEqual(((GuildRole) obj).g(), "@everyone")) { @@ -147,7 +147,7 @@ public final class WidgetGuildClone extends WidgetGuildCreate { RolesListView rolesListView = getBinding().i; RolesListView rolesListView2 = getBinding().i; m.checkNotNullExpressionValue(rolesListView2, "binding.guildTemplatePreviewRoles"); - rolesListView.updateView(arrayList, ColorCompat.getThemedColor(rolesListView2.getContext(), (int) R.attr.primary_300), serializedSourceGuild.q()); + rolesListView.updateView(arrayList, ColorCompat.getThemedColor(rolesListView2.getContext(), (int) R.attr.primary_300), serializedSourceGuild.r()); } } } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInvite.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInvite.java index 246e8e2b39..9fdbd02ffc 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInvite.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInvite.java @@ -48,7 +48,7 @@ public final class GuildInvite implements Serializable { String str = modelInvite.code; m.checkNotNullExpressionValue(str, "invite.code"); Guild guild = modelInvite.getGuild(); - Long valueOf = guild != null ? Long.valueOf(guild.q()) : null; + Long valueOf = guild != null ? Long.valueOf(guild.r()) : null; Channel channel2 = modelInvite.getChannel(); Long valueOf2 = channel2 != null ? Long.valueOf(channel2.h()) : null; User inviter = modelInvite.getInviter(); diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper$joinViaInvite$4.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper$joinViaInvite$4.java index e76092ae76..2960a0114f 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper$joinViaInvite$4.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper$joinViaInvite$4.java @@ -153,7 +153,7 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio HubEmailEntryPoint hubEmailEntryPoint = HubEmailEntryPoint.Invite; Guild guild5 = this.$invite.getGuild(); if (guild5 != null) { - str = guild5.w(); + str = guild5.x(); } if (str == null) { str = ""; @@ -168,7 +168,7 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio ref$ObjectRef2 = ref$ObjectRef4; modelInvite4 = null; guild = this.$invite.getGuild(); - if (((guild != null || (boxLong2 = b.boxLong(guild.q())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) { + if (((guild != null || (boxLong2 = b.boxLong(guild.r())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) { Function2 function23 = this.$onInvitePostSuccess; ModelInvite modelInvite5 = this.$invite; this.L$0 = ref$ObjectRef2; @@ -194,7 +194,7 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio z2 = boxBoolean.booleanValue(); if (this.$invite.getGuild() != null) { Guild guild6 = this.$invite.getGuild(); - if (((guild6 == null || (boxLong = b.boxLong(guild6.q())) == null) ? 0 : boxLong.longValue()) > 0) { + if (((guild6 == null || (boxLong = b.boxLong(guild6.r())) == null) ? 0 : boxLong.longValue()) > 0) { if (this.$invite.getGuildScheduledEvent() != null) { GuildScheduledEvent guildScheduledEvent = this.$invite.getGuildScheduledEvent(); if ((guildScheduledEvent != null ? guildScheduledEvent.m() : null) != GuildScheduledEventStatus.ACTIVE) { @@ -419,7 +419,7 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio MemberVerificationUtils memberVerificationUtils = MemberVerificationUtils.INSTANCE; Context context2 = ref$ObjectRef4.element; Guild guild7 = this.$invite.getGuild(); - memberVerificationUtils.maybeShowVerificationGate(context2, ref$ObjectRef5.element, (guild7 == null || (boxLong3 = b.boxLong(guild7.q())) == null) ? -1 : boxLong3.longValue(), this.$location, this.$invite, new InviteJoinHelper$joinViaInvite$4$hasCompletedMembershipGate$1$1(gVar2), new InviteJoinHelper$joinViaInvite$4$hasCompletedMembershipGate$1$2(gVar2)); + memberVerificationUtils.maybeShowVerificationGate(context2, ref$ObjectRef5.element, (guild7 == null || (boxLong3 = b.boxLong(guild7.r())) == null) ? -1 : boxLong3.longValue(), this.$location, this.$invite, new InviteJoinHelper$joinViaInvite$4$hasCompletedMembershipGate$1$1(gVar2), new InviteJoinHelper$joinViaInvite$4$hasCompletedMembershipGate$1$2(gVar2)); obj4 = gVar2.getOrThrow(); if (obj4 == c.getCOROUTINE_SUSPENDED()) { d0.w.i.a.g.probeCoroutineSuspended(this); @@ -433,7 +433,7 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio return Unit.a; } guild = this.$invite.getGuild(); - if (((guild != null || (boxLong2 = b.boxLong(guild.q())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) { + if (((guild != null || (boxLong2 = b.boxLong(guild.r())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) { } } break; @@ -447,7 +447,7 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio if (!((Boolean) obj4).booleanValue()) { } guild = this.$invite.getGuild(); - if (((guild != null || (boxLong2 = b.boxLong(guild.q())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) { + if (((guild != null || (boxLong2 = b.boxLong(guild.r())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) { } break; case 2: diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper.java index af580783c9..c5bf9db7ec 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper.java @@ -74,7 +74,7 @@ public final class InviteJoinHelper { private final void navigateToGuild(ModelInvite modelInvite) { Guild guild = modelInvite.getGuild(); if (guild != null) { - StoreStream.Companion.getGuildSelected().set(guild.q()); + StoreStream.Companion.getGuildSelected().set(guild.r()); } GuildScheduledEvent guildScheduledEvent = modelInvite.getGuildScheduledEvent(); if (guildScheduledEvent != null) { diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureLoadedUI$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureLoadedUI$2.java index 56b24a4aec..15be3dd8d2 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureLoadedUI$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureLoadedUI$2.java @@ -101,7 +101,7 @@ public final class WidgetGuildInvite$configureLoadedUI$2 implements View.OnClick Intent addFlags = new Intent().addFlags(268468224); Guild guild = modelInvite.getGuild(); Long l = null; - Long boxLong = b.boxBoolean(modelInvite.isNewMember()).booleanValue() ? guild != null ? b.boxLong(guild.q()) : null : null; + Long boxLong = b.boxBoolean(modelInvite.isNewMember()).booleanValue() ? guild != null ? b.boxLong(guild.r()) : null : null; GuildScheduledEvent guildScheduledEvent = modelInvite.getGuildScheduledEvent(); if (guildScheduledEvent != null) { l = b.boxLong(guildScheduledEvent.h()); diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java index f26d74c7fd..1951206123 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java @@ -162,7 +162,7 @@ public final class WidgetGuildInviteShare extends AppFragment { } if ((!inviteSuggestionItems.isEmpty()) && !this.hasTrackedSuggestionsViewed) { ModelInvite invite2 = widgetInviteModel.getInvite(); - long q = (invite2 == null || (guild = invite2.getGuild()) == null) ? 0 : guild.q(); + long r = (invite2 == null || (guild = invite2.getGuild()) == null) ? 0 : guild.r(); AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE; ArrayList arrayList = new ArrayList(); for (Object obj : inviteSuggestionItems) { @@ -184,7 +184,7 @@ public final class WidgetGuildInviteShare extends AppFragment { for (InviteSuggestionItem.UserItem userItem : arrayList3) { arrayList4.add(userItem.getUser()); } - analyticsTracker.inviteSuggestionOpened(q, arrayList2, arrayList4); + analyticsTracker.inviteSuggestionOpened(r, arrayList2, arrayList4); this.hasTrackedSuggestionsViewed = true; } TextView textView = getBinding().f1917c; diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java index b56ca949eb..5671ece750 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java @@ -198,7 +198,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment { } if ((!inviteSuggestionItems.isEmpty()) && !this.hasTrackedSuggestionsViewed) { ModelInvite invite2 = widgetInviteModel.getInvite(); - long q = (invite2 == null || (guild = invite2.getGuild()) == null) ? 0 : guild.q(); + long r = (invite2 == null || (guild = invite2.getGuild()) == null) ? 0 : guild.r(); AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE; ArrayList arrayList = new ArrayList(); for (Object obj : inviteSuggestionItems) { @@ -220,7 +220,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment { for (InviteSuggestionItem.UserItem userItem : arrayList3) { arrayList4.add(userItem.getUser()); } - analyticsTracker.inviteSuggestionOpened(q, arrayList2, arrayList4); + analyticsTracker.inviteSuggestionOpened(r, arrayList2, arrayList4); this.hasTrackedSuggestionsViewed = true; } TextView textView = getBinding().f1918c; diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java index 0dc8dbc054..d687aac8f0 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java @@ -193,7 +193,7 @@ public final class WidgetInviteInfo extends ConstraintLayout { if (guild != null) { GuildView guildView = this.binding.b; m.checkNotNullExpressionValue(guild, "it"); - guildView.a(IconUtils.getForGuild$default(new com.discord.models.guild.Guild(guild), null, true, null, 10, null), GuildUtilsKt.computeShortName(guild.w())); + guildView.a(IconUtils.getForGuild$default(new com.discord.models.guild.Guild(guild), null, true, null, 10, null), GuildUtilsKt.computeShortName(guild.x())); } String str = null; if (z2) { @@ -213,11 +213,11 @@ public final class WidgetInviteInfo extends ConstraintLayout { TextView textView = this.binding.e; m.checkNotNullExpressionValue(textView, "binding.inviteMessage"); Guild guild2 = modelInvite.getGuild(); - String w = guild2 != null ? guild2.w() : null; - if (w == null) { - w = ""; + String x2 = guild2 != null ? guild2.x() : null; + if (x2 == null) { + x2 = ""; } - textView.setText(getFormattedGuildName(w)); + textView.setText(getFormattedGuildName(x2)); Guild guild3 = modelInvite.getGuild(); if (guild3 == null || (m2 = guild3.m()) == null || !m2.contains(GuildFeature.VERIFIED)) { Guild guild4 = modelInvite.getGuild(); diff --git a/app/src/main/java/com/discord/widgets/hubs/HubAddServerState.java b/app/src/main/java/com/discord/widgets/hubs/HubAddServerState.java index 572b9d6ef1..5e68d06f39 100644 --- a/app/src/main/java/com/discord/widgets/hubs/HubAddServerState.java +++ b/app/src/main/java/com/discord/widgets/hubs/HubAddServerState.java @@ -1,7 +1,7 @@ package com.discord.widgets.hubs; import c.d.b.a.a; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.models.guild.Guild; import d0.t.n; import d0.z.d.m; @@ -9,7 +9,7 @@ import java.util.List; import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: WidgetHubAddServerViewModel.kt */ public final class HubAddServerState { - private final List addedDirectories; + private final List addedDirectories; private final List addedGuilds; private final Long directoryChannelId; private final String hubName; @@ -20,7 +20,7 @@ public final class HubAddServerState { this(null, null, 0, null, null, null, 63, null); } - public HubAddServerState(String str, Long l, int i, List list, List list2, List list3) { + public HubAddServerState(String str, Long l, int i, List list, List list2, List list3) { m.checkNotNullParameter(str, "hubName"); m.checkNotNullParameter(list, "selectableGuilds"); m.checkNotNullParameter(list2, "addedGuilds"); @@ -82,11 +82,11 @@ public final class HubAddServerState { return this.addedGuilds; } - public final List component6() { + public final List component6() { return this.addedDirectories; } - public final HubAddServerState copy(String str, Long l, int i, List list, List list2, List list3) { + public final HubAddServerState copy(String str, Long l, int i, List list, List list2, List list3) { m.checkNotNullParameter(str, "hubName"); m.checkNotNullParameter(list, "selectableGuilds"); m.checkNotNullParameter(list2, "addedGuilds"); @@ -105,7 +105,7 @@ public final class HubAddServerState { return m.areEqual(this.hubName, hubAddServerState.hubName) && m.areEqual(this.directoryChannelId, hubAddServerState.directoryChannelId) && this.selectedIndex == hubAddServerState.selectedIndex && m.areEqual(this.selectableGuilds, hubAddServerState.selectableGuilds) && m.areEqual(this.addedGuilds, hubAddServerState.addedGuilds) && m.areEqual(this.addedDirectories, hubAddServerState.addedDirectories); } - public final List getAddedDirectories() { + public final List getAddedDirectories() { return this.addedDirectories; } @@ -139,7 +139,7 @@ public final class HubAddServerState { int hashCode3 = (hashCode2 + (list != null ? list.hashCode() : 0)) * 31; List list2 = this.addedGuilds; int hashCode4 = (hashCode3 + (list2 != null ? list2.hashCode() : 0)) * 31; - List list3 = this.addedDirectories; + List list3 = this.addedDirectories; if (list3 != null) { i = list3.hashCode(); } diff --git a/app/src/main/java/com/discord/widgets/hubs/HubDescriptionState.java b/app/src/main/java/com/discord/widgets/hubs/HubDescriptionState.java index e7c989d268..68380f1461 100644 --- a/app/src/main/java/com/discord/widgets/hubs/HubDescriptionState.java +++ b/app/src/main/java/com/discord/widgets/hubs/HubDescriptionState.java @@ -3,7 +3,7 @@ package com.discord.widgets.hubs; import c.d.b.a.a; import com.discord.api.channel.Channel; import com.discord.api.channel.ChannelUtils; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.models.hubs.DirectoryEntryCategory; import com.discord.stores.utilities.Default; import com.discord.stores.utilities.RestCallState; @@ -11,7 +11,7 @@ import d0.z.d.m; import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: WidgetHubDescriptionViewModel.kt */ public final class HubDescriptionState { - private final RestCallState addServerAsync; + private final RestCallState addServerAsync; private final Channel channel; private final String guildName; private final Integer primaryCategoryId; @@ -20,7 +20,7 @@ public final class HubDescriptionState { this(null, null, null, null, 15, null); } - public HubDescriptionState(Channel channel, Integer num, String str, RestCallState restCallState) { + public HubDescriptionState(Channel channel, Integer num, String str, RestCallState restCallState) { m.checkNotNullParameter(str, "guildName"); m.checkNotNullParameter(restCallState, "addServerAsync"); this.channel = channel; @@ -64,11 +64,11 @@ public final class HubDescriptionState { return this.guildName; } - public final RestCallState component4() { + public final RestCallState component4() { return this.addServerAsync; } - public final HubDescriptionState copy(Channel channel, Integer num, String str, RestCallState restCallState) { + public final HubDescriptionState copy(Channel channel, Integer num, String str, RestCallState restCallState) { m.checkNotNullParameter(str, "guildName"); m.checkNotNullParameter(restCallState, "addServerAsync"); return new HubDescriptionState(channel, num, str, restCallState); @@ -85,7 +85,7 @@ public final class HubDescriptionState { return m.areEqual(this.channel, hubDescriptionState.channel) && m.areEqual(this.primaryCategoryId, hubDescriptionState.primaryCategoryId) && m.areEqual(this.guildName, hubDescriptionState.guildName) && m.areEqual(this.addServerAsync, hubDescriptionState.addServerAsync); } - public final RestCallState getAddServerAsync() { + public final RestCallState getAddServerAsync() { return this.addServerAsync; } @@ -124,7 +124,7 @@ public final class HubDescriptionState { int hashCode2 = (hashCode + (num != null ? num.hashCode() : 0)) * 31; String str = this.guildName; int hashCode3 = (hashCode2 + (str != null ? str.hashCode() : 0)) * 31; - RestCallState restCallState = this.addServerAsync; + RestCallState restCallState = this.addServerAsync; if (restCallState != null) { i = restCallState.hashCode(); } diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServer$onServerClickListener$1$$special$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServer$onServerClickListener$1$$special$$inlined$let$lambda$1.java index eee5e96b54..a38bb488f3 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServer$onServerClickListener$1$$special$$inlined$let$lambda$1.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServer$onServerClickListener$1$$special$$inlined$let$lambda$1.java @@ -1,19 +1,19 @@ package com.discord.widgets.hubs; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: WidgetHubAddServer.kt */ public final class WidgetHubAddServer$onServerClickListener$1$$special$$inlined$let$lambda$1 extends o implements Function0 { - public final /* synthetic */ DirectoryEntry $directoryEntry; + public final /* synthetic */ DirectoryEntryGuild $directoryEntry; public final /* synthetic */ HubAddServerState $state$inlined; public final /* synthetic */ WidgetHubAddServer$onServerClickListener$1 this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetHubAddServer$onServerClickListener$1$$special$$inlined$let$lambda$1(DirectoryEntry directoryEntry, WidgetHubAddServer$onServerClickListener$1 widgetHubAddServer$onServerClickListener$1, HubAddServerState hubAddServerState) { + public WidgetHubAddServer$onServerClickListener$1$$special$$inlined$let$lambda$1(DirectoryEntryGuild directoryEntryGuild, WidgetHubAddServer$onServerClickListener$1 widgetHubAddServer$onServerClickListener$1, HubAddServerState hubAddServerState) { super(0); - this.$directoryEntry = directoryEntry; + this.$directoryEntry = directoryEntryGuild; this.this$0 = widgetHubAddServer$onServerClickListener$1; this.$state$inlined = hubAddServerState; } diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServer$onServerClickListener$1.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServer$onServerClickListener$1.java index 5edee2b04a..2e464cbde1 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServer$onServerClickListener$1.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServer$onServerClickListener$1.java @@ -2,7 +2,7 @@ package com.discord.widgets.hubs; import android.content.Context; import c.a.d.j; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.utilities.directories.DirectoryUtils; import d0.z.d.m; import d0.z.d.o; @@ -46,7 +46,7 @@ public final class WidgetHubAddServer$onServerClickListener$1 extends o implemen break; } obj = it.next(); - if (((DirectoryEntry) obj).e().h() == this.$guildId) { + if (((DirectoryEntryGuild) obj).e().h() == this.$guildId) { z2 = true; continue; } else { @@ -57,9 +57,9 @@ public final class WidgetHubAddServer$onServerClickListener$1 extends o implemen break; } } - DirectoryEntry directoryEntry = (DirectoryEntry) obj; - if (directoryEntry != null) { - DirectoryUtils.INSTANCE.showServerOptions(this.this$0, directoryEntry, hubAddServerState.getHubName(), true, new WidgetHubAddServer$onServerClickListener$1$$special$$inlined$let$lambda$1(directoryEntry, this, hubAddServerState)); + DirectoryEntryGuild directoryEntryGuild = (DirectoryEntryGuild) obj; + if (directoryEntryGuild != null) { + DirectoryUtils.INSTANCE.showServerOptions(this.this$0, directoryEntryGuild, hubAddServerState.getHubName(), true, new WidgetHubAddServer$onServerClickListener$1$$special$$inlined$let$lambda$1(directoryEntryGuild, this, hubAddServerState)); return; } WidgetHubAddServer widgetHubAddServer = this.this$0; diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServerViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServerViewModel$Companion$observeStores$1.java index 8db0d37033..1fef63f588 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServerViewModel$Companion$observeStores$1.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServerViewModel$Companion$observeStores$1.java @@ -3,7 +3,7 @@ package com.discord.widgets.hubs; import c.d.b.a.a; import com.discord.api.channel.Channel; import com.discord.api.channel.ChannelUtils; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.app.AppLog; import com.discord.models.guild.Guild; import com.discord.stores.StoreChannels; @@ -55,7 +55,7 @@ public final class WidgetHubAddServerViewModel$Companion$observeStores$1 extends public final HubAddServerState mo1invoke() { Long l; Object obj; - RestCallState> directoriesForChannel; + RestCallState> directoriesForChannel; Object obj2; boolean z2; boolean z3; @@ -123,13 +123,13 @@ public final class WidgetHubAddServerViewModel$Companion$observeStores$1 extends Logger.e$default(appLog2, R2.toString(), null, null, 6, null); selectedChannel = null; } - List invoke = (selectedChannel == null || (directoriesForChannel = this.$directoriesStore.getDirectoriesForChannel(selectedChannel.h())) == null) ? null : directoriesForChannel.invoke(); + List invoke = (selectedChannel == null || (directoriesForChannel = this.$directoriesStore.getDirectoriesForChannel(selectedChannel.h())) == null) ? null : directoriesForChannel.invoke(); if (invoke == null) { invoke = n.emptyList(); } ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(invoke, 10)); - for (DirectoryEntry directoryEntry : invoke) { - arrayList.add(Long.valueOf(directoryEntry.e().h())); + for (DirectoryEntryGuild directoryEntryGuild : invoke) { + arrayList.add(Long.valueOf(directoryEntryGuild.e().h())); } Set set = u.toSet(arrayList); ArrayList arrayList2 = new ArrayList(); @@ -156,7 +156,7 @@ public final class WidgetHubAddServerViewModel$Companion$observeStores$1 extends } ArrayList arrayList6 = new ArrayList(); for (Object obj5 : invoke) { - if (arrayList5.contains(Long.valueOf(((DirectoryEntry) obj5).e().h()))) { + if (arrayList5.contains(Long.valueOf(((DirectoryEntryGuild) obj5).e().h()))) { arrayList6.add(obj5); } } diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAuthentication$configureUi$1.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAuthentication$configureUi$1.java index 962b8dcd83..50527a030a 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAuthentication$configureUi$1.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAuthentication$configureUi$1.java @@ -36,7 +36,7 @@ public final class WidgetHubAuthentication$configureUi$1 extends o implements Fu if (invoke.b()) { FragmentActivity activity = this.this$0.getActivity(); if (activity != null) { - activity.setResult(-1, d.e2(new AuthenticationResult(invoke.a().q()))); + activity.setResult(-1, d.e2(new AuthenticationResult(invoke.a().r()))); activity.finish(); } StoreStream.Companion.getNux().updateNux(WidgetHubAuthentication$configureUi$1$1$2.INSTANCE); diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescription$configureUI$3.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescription$configureUI$3.java index f019a9d9d7..927dc8df34 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescription$configureUI$3.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescription$configureUI$3.java @@ -2,7 +2,7 @@ package com.discord.widgets.hubs; import androidx.fragment.app.FragmentActivity; import c.c.a.a0.d; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.stores.StoreStream; import com.discord.stores.utilities.Success; import d0.z.d.m; @@ -10,7 +10,7 @@ import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetHubDescription.kt */ -public final class WidgetHubDescription$configureUI$3 extends o implements Function1, Unit> { +public final class WidgetHubDescription$configureUI$3 extends o implements Function1, Unit> { public final /* synthetic */ WidgetHubDescription this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -22,12 +22,12 @@ public final class WidgetHubDescription$configureUI$3 extends o implements Funct /* Return type fixed from 'java.lang.Object' to match base method */ /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(Success success) { - invoke((Success) success); + public /* bridge */ /* synthetic */ Unit invoke(Success success) { + invoke((Success) success); return Unit.a; } - public final void invoke(Success success) { + public final void invoke(Success success) { m.checkNotNullParameter(success, "it"); StoreStream.Companion.getDirectories().addServerToDirectory(this.this$0.getArgs().getChannelId(), success.invoke()); WidgetHubDescription widgetHubDescription = this.this$0; diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescriptionViewModel$addServer$1.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescriptionViewModel$addServer$1.java index 00bb6998af..cd4b25ba12 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescriptionViewModel$addServer$1.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescriptionViewModel$addServer$1.java @@ -2,12 +2,12 @@ package com.discord.widgets.hubs; import com.discord.analytics.generated.events.network_action.TrackNetworkActionDirectoryGuildEntryCreate; import com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.models.hubs.DirectoryEntryCategory; import d0.z.d.o; import kotlin.jvm.functions.Function1; /* compiled from: WidgetHubDescriptionViewModel.kt */ -public final class WidgetHubDescriptionViewModel$addServer$1 extends o implements Function1 { +public final class WidgetHubDescriptionViewModel$addServer$1 extends o implements Function1 { public final /* synthetic */ DirectoryEntryCategory $category; public final /* synthetic */ long $channelId; public final /* synthetic */ long $guildId; @@ -20,7 +20,7 @@ public final class WidgetHubDescriptionViewModel$addServer$1 extends o implement this.$category = directoryEntryCategory; } - public final TrackNetworkMetadataReceiver invoke(DirectoryEntry directoryEntry) { + public final TrackNetworkMetadataReceiver invoke(DirectoryEntryGuild directoryEntryGuild) { return new TrackNetworkActionDirectoryGuildEntryCreate(Long.valueOf(this.$channelId), Long.valueOf(this.$guildId), Long.valueOf((long) this.$category.getKey())); } } diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescriptionViewModel$addServer$2.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescriptionViewModel$addServer$2.java index a66714e5cb..c851eab7fa 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescriptionViewModel$addServer$2.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescriptionViewModel$addServer$2.java @@ -1,13 +1,13 @@ package com.discord.widgets.hubs; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.stores.utilities.RestCallState; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetHubDescriptionViewModel.kt */ -public final class WidgetHubDescriptionViewModel$addServer$2 extends o implements Function1, Unit> { +public final class WidgetHubDescriptionViewModel$addServer$2 extends o implements Function1, Unit> { public final /* synthetic */ HubDescriptionState $state; public final /* synthetic */ WidgetHubDescriptionViewModel this$0; @@ -21,12 +21,12 @@ public final class WidgetHubDescriptionViewModel$addServer$2 extends o implement /* Return type fixed from 'java.lang.Object' to match base method */ /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(RestCallState restCallState) { - invoke((RestCallState) restCallState); + public /* bridge */ /* synthetic */ Unit invoke(RestCallState restCallState) { + invoke((RestCallState) restCallState); return Unit.a; } - public final void invoke(RestCallState restCallState) { + public final void invoke(RestCallState restCallState) { m.checkNotNullParameter(restCallState, "it"); WidgetHubDescriptionViewModel.access$updateViewState(this.this$0, HubDescriptionState.copy$default(this.$state, null, null, null, restCallState, 7, null)); } diff --git a/app/src/main/java/com/discord/widgets/hubs/events/HubEventsArgs.java b/app/src/main/java/com/discord/widgets/hubs/events/HubEventsArgs.java new file mode 100644 index 0000000000..4cc5bdab44 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/hubs/events/HubEventsArgs.java @@ -0,0 +1,77 @@ +package com.discord.widgets.hubs.events; + +import a0.a.a.b; +import android.os.Parcel; +import android.os.Parcelable; +import c.d.b.a.a; +import d0.z.d.m; +/* compiled from: WidgetHubEventsPage.kt */ +public final class HubEventsArgs implements Parcelable { + public static final Parcelable.Creator CREATOR = new Creator(); + private final long guildId; + + public static class Creator implements Parcelable.Creator { + @Override // android.os.Parcelable.Creator + public final HubEventsArgs createFromParcel(Parcel parcel) { + m.checkNotNullParameter(parcel, "in"); + return new HubEventsArgs(parcel.readLong()); + } + + @Override // android.os.Parcelable.Creator + public final HubEventsArgs[] newArray(int i) { + return new HubEventsArgs[i]; + } + } + + public HubEventsArgs(long j) { + this.guildId = j; + } + + public static /* synthetic */ HubEventsArgs copy$default(HubEventsArgs hubEventsArgs, long j, int i, Object obj) { + if ((i & 1) != 0) { + j = hubEventsArgs.guildId; + } + return hubEventsArgs.copy(j); + } + + public final long component1() { + return this.guildId; + } + + public final HubEventsArgs copy(long j) { + return new HubEventsArgs(j); + } + + @Override // android.os.Parcelable + public int describeContents() { + return 0; + } + + @Override // java.lang.Object + public boolean equals(Object obj) { + if (this != obj) { + return (obj instanceof HubEventsArgs) && this.guildId == ((HubEventsArgs) obj).guildId; + } + return true; + } + + public final long getGuildId() { + return this.guildId; + } + + @Override // java.lang.Object + public int hashCode() { + return b.a(this.guildId); + } + + @Override // java.lang.Object + public String toString() { + return a.B(a.R("HubEventsArgs(guildId="), this.guildId, ")"); + } + + @Override // android.os.Parcelable + public void writeToParcel(Parcel parcel, int i) { + m.checkNotNullParameter(parcel, "parcel"); + parcel.writeLong(this.guildId); + } +} diff --git a/app/src/main/java/com/discord/widgets/hubs/events/WidgetHubEventsPage$$special$$inlined$args$1.java b/app/src/main/java/com/discord/widgets/hubs/events/WidgetHubEventsPage$$special$$inlined$args$1.java new file mode 100644 index 0000000000..6eb326180a --- /dev/null +++ b/app/src/main/java/com/discord/widgets/hubs/events/WidgetHubEventsPage$$special$$inlined$args$1.java @@ -0,0 +1,39 @@ +package com.discord.widgets.hubs.events; + +import android.os.Bundle; +import c.d.b.a.a; +import com.discord.app.AppBottomSheet; +import d0.z.d.a0; +import d0.z.d.o; +import kotlin.jvm.functions.Function0; +/* compiled from: ArgUtils.kt */ +public final class WidgetHubEventsPage$$special$$inlined$args$1 extends o implements Function0 { + public final /* synthetic */ String $argsKey; + public final /* synthetic */ AppBottomSheet $this_args; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetHubEventsPage$$special$$inlined$args$1(AppBottomSheet appBottomSheet, String str) { + super(0); + this.$this_args = appBottomSheet; + this.$argsKey = str; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final HubEventsArgs mo1invoke() { + Bundle arguments = this.$this_args.getArguments(); + HubEventsArgs hubEventsArgs = null; + Object obj = arguments != null ? arguments.get(this.$argsKey) : null; + if (obj instanceof HubEventsArgs) { + hubEventsArgs = obj; + } + HubEventsArgs hubEventsArgs2 = hubEventsArgs; + if (hubEventsArgs2 != null) { + return hubEventsArgs2; + } + StringBuilder R = a.R("Missing args for class type "); + R.append(a0.getOrCreateKotlinClass(HubEventsArgs.class).getSimpleName()); + R.append(" + key "); + throw new IllegalStateException(a.G(R, this.$argsKey, '!')); + } +} diff --git a/app/src/main/java/com/discord/widgets/hubs/events/WidgetHubEventsPage.java b/app/src/main/java/com/discord/widgets/hubs/events/WidgetHubEventsPage.java index 440bd8ba38..67953e0a76 100644 --- a/app/src/main/java/com/discord/widgets/hubs/events/WidgetHubEventsPage.java +++ b/app/src/main/java/com/discord/widgets/hubs/events/WidgetHubEventsPage.java @@ -3,24 +3,47 @@ package com.discord.widgets.hubs.events; import android.os.Bundle; import android.view.View; import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import c.c.a.a0.d; import c.d.b.a.a; import com.discord.R; import com.discord.app.AppBottomSheet; import com.discord.databinding.WidgetHubEventsPageBinding; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt; +import com.discord.widgets.hubs.events.HubEventsPage; import d0.g; import d0.z.d.m; import kotlin.Lazy; +import kotlin.jvm.internal.DefaultConstructorMarker; import kotlin.reflect.KProperty; /* compiled from: WidgetHubEventsPage.kt */ public final class WidgetHubEventsPage extends AppBottomSheet { public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.b0(WidgetHubEventsPage.class, "binding", "getBinding()Lcom/discord/databinding/WidgetHubEventsPageBinding;", 0)}; + public static final Companion Companion = new Companion(null); private final Lazy adapter$delegate = g.lazy(new WidgetHubEventsPage$adapter$2(this)); + private final Lazy args$delegate = g.lazy(new WidgetHubEventsPage$$special$$inlined$args$1(this, "intent_args_key")); private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetHubEventsPage$binding$2.INSTANCE, null, 2, null); + /* compiled from: WidgetHubEventsPage.kt */ + public static final class Companion { + private Companion() { + } + + public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) { + this(); + } + + public final void show(FragmentManager fragmentManager, long j) { + m.checkNotNullParameter(fragmentManager, "fragmentManager"); + WidgetHubEventsPage widgetHubEventsPage = new WidgetHubEventsPage(); + widgetHubEventsPage.setArguments(d.c2(new HubEventsArgs(j))); + widgetHubEventsPage.show(fragmentManager, WidgetHubEventsPage.class.getName()); + } + } + public WidgetHubEventsPage() { super(false, 1, null); } @@ -29,6 +52,10 @@ public final class WidgetHubEventsPage extends AppBottomSheet { return (WidgetHubEventsPageAdapter) this.adapter$delegate.getValue(); } + public final HubEventsArgs getArgs() { + return (HubEventsArgs) this.args$delegate.getValue(); + } + public final WidgetHubEventsPageBinding getBinding() { return (WidgetHubEventsPageBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]); } @@ -45,5 +72,6 @@ public final class WidgetHubEventsPage extends AppBottomSheet { RecyclerView recyclerView = getBinding().b; recyclerView.setAdapter(getAdapter()); recyclerView.setLayoutManager(new LinearLayoutManager(recyclerView.getContext())); + getAdapter().setItems(d0.t.m.listOf(HubEventsPage.Header.INSTANCE)); } } diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel$Companion$getStoreState$1.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel$Companion$getStoreState$1.java index 9a3e53e552..fd6e86aaad 100644 --- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel$Companion$getStoreState$1.java +++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel$Companion$getStoreState$1.java @@ -1,7 +1,7 @@ package com.discord.widgets.mobile_reports; import com.discord.api.channel.Channel; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.api.guildscheduledevent.GuildScheduledEvent; import com.discord.api.stageinstance.StageInstance; import com.discord.models.guild.Guild; @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; import rx.functions.Func8; /* compiled from: MobileReportsViewModel.kt */ -public final class MobileReportsViewModel$Companion$getStoreState$1 implements Func8, RestCallState>, GuildScheduledEvent, Guild, MobileReportsViewModel.StoreState> { +public final class MobileReportsViewModel$Companion$getStoreState$1 implements Func8, RestCallState>, GuildScheduledEvent, Guild, MobileReportsViewModel.StoreState> { public final /* synthetic */ MobileReportArgs $args; public MobileReportsViewModel$Companion$getStoreState$1(MobileReportArgs mobileReportArgs) { @@ -24,11 +24,11 @@ public final class MobileReportsViewModel$Companion$getStoreState$1 map, RestCallState> restCallState, GuildScheduledEvent guildScheduledEvent, Guild guild2) { + public final MobileReportsViewModel.StoreState call(Message message, Channel channel, Guild guild, StageInstance stageInstance, Map map, RestCallState> restCallState, GuildScheduledEvent guildScheduledEvent, Guild guild2) { List list; boolean z2; MobileReportArgs mobileReportArgs = this.$args; - DirectoryEntry directoryEntry = null; + DirectoryEntryGuild directoryEntryGuild = null; if (!(mobileReportArgs instanceof MobileReportArgs.DirectoryServer)) { mobileReportArgs = null; } @@ -43,7 +43,7 @@ public final class MobileReportsViewModel$Companion$getStoreState$1 map, RestCallState> restCallState, GuildScheduledEvent guildScheduledEvent, Guild guild2) { - return call(message, channel, guild, stageInstance, (Map) map, (RestCallState>) restCallState, guildScheduledEvent, guild2); + public /* bridge */ /* synthetic */ MobileReportsViewModel.StoreState call(Message message, Channel channel, Guild guild, StageInstance stageInstance, Map map, RestCallState> restCallState, GuildScheduledEvent guildScheduledEvent, Guild guild2) { + return call(message, channel, guild, stageInstance, (Map) map, (RestCallState>) restCallState, guildScheduledEvent, guild2); } } diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java index 9921c05e68..efde499b5f 100644 --- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java +++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java @@ -5,7 +5,7 @@ import androidx.core.app.NotificationCompat; import c.d.b.a.a; import com.discord.R; import com.discord.api.channel.Channel; -import com.discord.api.directory.DirectoryEntry; +import com.discord.api.directory.DirectoryEntryGuild; import com.discord.api.guildscheduledevent.GuildScheduledEvent; import com.discord.api.report.MenuAPIResponse; import com.discord.api.report.NodeElementResult; @@ -441,7 +441,7 @@ public final class MobileReportsViewModel extends AppViewModel { Observable observeFromChannelId = companion.getGuilds().observeFromChannelId(mobileReportArgs.getChannelId()); Observable observeStageInstanceForChannel = companion.getStageInstances().observeStageInstanceForChannel(mobileReportArgs.getChannelId()); Observable> observeForType = companion.getUserRelationships().observeForType(2); - Observable>> observeDirectoriesForChannel = companion.getDirectories().observeDirectoriesForChannel(mobileReportArgs.getChannelId()); + Observable>> observeDirectoriesForChannel = companion.getDirectories().observeDirectoriesForChannel(mobileReportArgs.getChannelId()); StoreGuildScheduledEvents guildScheduledEvents = companion.getGuildScheduledEvents(); boolean z2 = mobileReportArgs instanceof MobileReportArgs.GuildScheduledEvent; MobileReportArgs.GuildScheduledEvent guildScheduledEvent2 = (MobileReportArgs.GuildScheduledEvent) (!z2 ? null : mobileReportArgs); @@ -464,38 +464,38 @@ public final class MobileReportsViewModel extends AppViewModel { /* compiled from: MobileReportsViewModel.kt */ public static final class DirectoryServerPreview { - private final DirectoryEntry directoryEntry; + private final DirectoryEntryGuild directoryEntry; private final Guild hub; - public DirectoryServerPreview(Guild guild, DirectoryEntry directoryEntry) { + public DirectoryServerPreview(Guild guild, DirectoryEntryGuild directoryEntryGuild) { m.checkNotNullParameter(guild, "hub"); - m.checkNotNullParameter(directoryEntry, "directoryEntry"); + m.checkNotNullParameter(directoryEntryGuild, "directoryEntry"); this.hub = guild; - this.directoryEntry = directoryEntry; + this.directoryEntry = directoryEntryGuild; } - public static /* synthetic */ DirectoryServerPreview copy$default(DirectoryServerPreview directoryServerPreview, Guild guild, DirectoryEntry directoryEntry, int i, Object obj) { + public static /* synthetic */ DirectoryServerPreview copy$default(DirectoryServerPreview directoryServerPreview, Guild guild, DirectoryEntryGuild directoryEntryGuild, int i, Object obj) { if ((i & 1) != 0) { guild = directoryServerPreview.hub; } if ((i & 2) != 0) { - directoryEntry = directoryServerPreview.directoryEntry; + directoryEntryGuild = directoryServerPreview.directoryEntry; } - return directoryServerPreview.copy(guild, directoryEntry); + return directoryServerPreview.copy(guild, directoryEntryGuild); } public final Guild component1() { return this.hub; } - public final DirectoryEntry component2() { + public final DirectoryEntryGuild component2() { return this.directoryEntry; } - public final DirectoryServerPreview copy(Guild guild, DirectoryEntry directoryEntry) { + public final DirectoryServerPreview copy(Guild guild, DirectoryEntryGuild directoryEntryGuild) { m.checkNotNullParameter(guild, "hub"); - m.checkNotNullParameter(directoryEntry, "directoryEntry"); - return new DirectoryServerPreview(guild, directoryEntry); + m.checkNotNullParameter(directoryEntryGuild, "directoryEntry"); + return new DirectoryServerPreview(guild, directoryEntryGuild); } public boolean equals(Object obj) { @@ -509,7 +509,7 @@ public final class MobileReportsViewModel extends AppViewModel { return m.areEqual(this.hub, directoryServerPreview.hub) && m.areEqual(this.directoryEntry, directoryServerPreview.directoryEntry); } - public final DirectoryEntry getDirectoryEntry() { + public final DirectoryEntryGuild getDirectoryEntry() { return this.directoryEntry; } @@ -521,9 +521,9 @@ public final class MobileReportsViewModel extends AppViewModel { Guild guild = this.hub; int i = 0; int hashCode = (guild != null ? guild.hashCode() : 0) * 31; - DirectoryEntry directoryEntry = this.directoryEntry; - if (directoryEntry != null) { - i = directoryEntry.hashCode(); + DirectoryEntryGuild directoryEntryGuild = this.directoryEntry; + if (directoryEntryGuild != null) { + i = directoryEntryGuild.hashCode(); } return hashCode + i; } @@ -1121,18 +1121,18 @@ public final class MobileReportsViewModel extends AppViewModel { public static final class StoreState { private final Map blockedUsers; private final Channel channel; - private final DirectoryEntry directoryEntry; + private final DirectoryEntryGuild directoryEntry; private final GuildScheduledEvent event; private final Guild guild; private final Message message; private final StageInstance stageInstance; - public StoreState(Message message, Channel channel, Guild guild, DirectoryEntry directoryEntry, StageInstance stageInstance, Map map, GuildScheduledEvent guildScheduledEvent) { + public StoreState(Message message, Channel channel, Guild guild, DirectoryEntryGuild directoryEntryGuild, StageInstance stageInstance, Map map, GuildScheduledEvent guildScheduledEvent) { m.checkNotNullParameter(map, "blockedUsers"); this.message = message; this.channel = channel; this.guild = guild; - this.directoryEntry = directoryEntry; + this.directoryEntry = directoryEntryGuild; this.stageInstance = stageInstance; this.blockedUsers = map; this.event = guildScheduledEvent; @@ -1140,7 +1140,7 @@ public final class MobileReportsViewModel extends AppViewModel { /* JADX DEBUG: Multi-variable search result rejected for r5v0, resolved type: com.discord.widgets.mobile_reports.MobileReportsViewModel$StoreState */ /* JADX WARN: Multi-variable type inference failed */ - public static /* synthetic */ StoreState copy$default(StoreState storeState, Message message, Channel channel, Guild guild, DirectoryEntry directoryEntry, StageInstance stageInstance, Map map, GuildScheduledEvent guildScheduledEvent, int i, Object obj) { + public static /* synthetic */ StoreState copy$default(StoreState storeState, Message message, Channel channel, Guild guild, DirectoryEntryGuild directoryEntryGuild, StageInstance stageInstance, Map map, GuildScheduledEvent guildScheduledEvent, int i, Object obj) { if ((i & 1) != 0) { message = storeState.message; } @@ -1151,7 +1151,7 @@ public final class MobileReportsViewModel extends AppViewModel { guild = storeState.guild; } if ((i & 8) != 0) { - directoryEntry = storeState.directoryEntry; + directoryEntryGuild = storeState.directoryEntry; } if ((i & 16) != 0) { stageInstance = storeState.stageInstance; @@ -1162,7 +1162,7 @@ public final class MobileReportsViewModel extends AppViewModel { if ((i & 64) != 0) { guildScheduledEvent = storeState.event; } - return storeState.copy(message, channel, guild, directoryEntry, stageInstance, map, guildScheduledEvent); + return storeState.copy(message, channel, guild, directoryEntryGuild, stageInstance, map, guildScheduledEvent); } public final Message component1() { @@ -1177,7 +1177,7 @@ public final class MobileReportsViewModel extends AppViewModel { return this.guild; } - public final DirectoryEntry component4() { + public final DirectoryEntryGuild component4() { return this.directoryEntry; } @@ -1193,9 +1193,9 @@ public final class MobileReportsViewModel extends AppViewModel { return this.event; } - public final StoreState copy(Message message, Channel channel, Guild guild, DirectoryEntry directoryEntry, StageInstance stageInstance, Map map, GuildScheduledEvent guildScheduledEvent) { + public final StoreState copy(Message message, Channel channel, Guild guild, DirectoryEntryGuild directoryEntryGuild, StageInstance stageInstance, Map map, GuildScheduledEvent guildScheduledEvent) { m.checkNotNullParameter(map, "blockedUsers"); - return new StoreState(message, channel, guild, directoryEntry, stageInstance, map, guildScheduledEvent); + return new StoreState(message, channel, guild, directoryEntryGuild, stageInstance, map, guildScheduledEvent); } public boolean equals(Object obj) { @@ -1217,7 +1217,7 @@ public final class MobileReportsViewModel extends AppViewModel { return this.channel; } - public final DirectoryEntry getDirectoryEntry() { + public final DirectoryEntryGuild getDirectoryEntry() { return this.directoryEntry; } @@ -1245,8 +1245,8 @@ public final class MobileReportsViewModel extends AppViewModel { int hashCode2 = (hashCode + (channel != null ? channel.hashCode() : 0)) * 31; Guild guild = this.guild; int hashCode3 = (hashCode2 + (guild != null ? guild.hashCode() : 0)) * 31; - DirectoryEntry directoryEntry = this.directoryEntry; - int hashCode4 = (hashCode3 + (directoryEntry != null ? directoryEntry.hashCode() : 0)) * 31; + DirectoryEntryGuild directoryEntryGuild = this.directoryEntry; + int hashCode4 = (hashCode3 + (directoryEntryGuild != null ? directoryEntryGuild.hashCode() : 0)) * 31; StageInstance stageInstance = this.stageInstance; int hashCode5 = (hashCode4 + (stageInstance != null ? stageInstance.hashCode() : 0)) * 31; Map map = this.blockedUsers; @@ -1731,7 +1731,7 @@ public final class MobileReportsViewModel extends AppViewModel { } private final DirectoryServerPreview parseDirectoryServerPreview(StoreState storeState) { - DirectoryEntry directoryEntry; + DirectoryEntryGuild directoryEntry; Guild guild = storeState.getGuild(); if (guild == null || (directoryEntry = storeState.getDirectoryEntry()) == null) { return null; diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.java index 0f363d25ed..74cb073434 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.java @@ -36,7 +36,7 @@ public final class WidgetServerSettingsOverview$configureUI$7 implements View.On public static final AnonymousClass1 INSTANCE = new AnonymousClass1(); public final Observable call(Guild guild) { - Observable F = StoreStream.Companion.getGuilds().observeGuild(guild.q()).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE); + Observable F = StoreStream.Companion.getGuilds().observeGuild(guild.r()).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE); m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }"); return F; } diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunityViewModel$updateGuild$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunityViewModel$updateGuild$2.java index c1582d5865..ab986af383 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunityViewModel$updateGuild$2.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunityViewModel$updateGuild$2.java @@ -36,7 +36,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel$updateGuild$2 ex m.checkNotNullParameter(guild, "it"); if (this.$currentConfig.getEveryonePermissions()) { Map roles = this.$currentConfig.getRoles(); - WidgetServerSettingsEnableCommunityViewModel.access$patchRole(this.this$0, new RestAPIParams.Role(null, null, null, null, null, Long.valueOf(-17448443967L & ((roles == null || (guildRole = roles.get(Long.valueOf(this.this$0.getGuildId()))) == null) ? 0 : guildRole.h())), guild.q(), null, 159, null)); + WidgetServerSettingsEnableCommunityViewModel.access$patchRole(this.this$0, new RestAPIParams.Role(null, null, null, null, null, Long.valueOf(-17448443967L & ((roles == null || (guildRole = roles.get(Long.valueOf(this.this$0.getGuildId()))) == null) ? 0 : guildRole.h())), guild.r(), null, 159, null)); return; } WidgetServerSettingsEnableCommunityViewModel.access$updateViewState(this.this$0, WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded.copy$default(this.$currentViewState, 0, false, null, 5, null)); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java index 2b2ca502e3..263d6f2d21 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -346,7 +346,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi TextView textView = binding.f; m.checkNotNullExpressionValue(textView, "appInfoHeader"); String string = getString(R.string.app_information); - textView.setText(string + " - 105.5 - Alpha (105205)"); + textView.setText(string + " - 105.6 - Alpha (105206)"); binding.B.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this)); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java index 20e2551bca..bc8db084e6 100644 --- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java +++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java @@ -83,7 +83,7 @@ public final class ViewHolderStageChannelRichPresence extends ViewHolderUserRich getRoot().setVisibility(8); return; } - Guild guild = new Guild(null, null, null, d, null, 0, stageChannelRichPresencePartyData.getGuildId(), null, 0, str, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, false, -585, 1, null); + Guild guild = new Guild(null, null, null, d, null, 0, stageChannelRichPresencePartyData.getGuildId(), null, 0, str, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, false, null, -585, 3, null); Resources resources = getRichPresenceImageLarge().getResources(); boolean hasIcon = guild.hasIcon(); getRichPresenceImageLarge().setVisibility(hasIcon ? 0 : 8); diff --git a/app/src/main/java/d0/e0/p/d/c.java b/app/src/main/java/d0/e0/p/d/c.java index 3adbfc3905..1859ff8ddd 100644 --- a/app/src/main/java/d0/e0/p/d/c.java +++ b/app/src/main/java/d0/e0/p/d/c.java @@ -12,8 +12,8 @@ import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; import kotlin.jvm.functions.Function16; -import kotlin.jvm.functions.Function19; import kotlin.jvm.functions.Function2; +import kotlin.jvm.functions.Function20; import kotlin.jvm.functions.Function3; import kotlin.jvm.functions.Function4; import kotlin.jvm.functions.Function5; @@ -23,7 +23,7 @@ import kotlin.jvm.functions.Function8; import kotlin.jvm.functions.Function9; import kotlin.reflect.KCallable; /* compiled from: FunctionWithAllInvokes.kt */ -public interface c extends Function0, Function1, Function10, Function11, Function12, Function13, Function14, Function15, Function16, d0.z.c.a, b, Function19, Function2, d0.z.c.c, d, e, Function3, Function4, Function5, Function6, Function7, Function8, Function9, KCallable { +public interface c extends Function0, Function1, Function10, Function11, Function12, Function13, Function14, Function15, Function16, d0.z.c.a, b, d0.z.c.c, Function2, Function20, d, e, Function3, Function4, Function5, Function6, Function7, Function8, Function9, KCallable { /* compiled from: FunctionWithAllInvokes.kt */ public static final class a { @@ -95,8 +95,8 @@ public interface c extends Function0, Function1, Functio return ((f) cVar).call(obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16); } - public static Object invoke(c cVar, Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8, Object obj9, Object obj10, Object obj11, Object obj12, Object obj13, Object obj14, Object obj15, Object obj16, Object obj17, Object obj18, Object obj19) { - return ((f) cVar).call(obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16, obj17, obj18, obj19); + public static Object invoke(c cVar, Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8, Object obj9, Object obj10, Object obj11, Object obj12, Object obj13, Object obj14, Object obj15, Object obj16, Object obj17, Object obj18, Object obj19, Object obj20) { + return ((f) cVar).call(obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16, obj17, obj18, obj19, obj20); } } } diff --git a/app/src/main/java/d0/e0/p/d/j.java b/app/src/main/java/d0/e0/p/d/j.java index 41dc980cbb..35209965a4 100644 --- a/app/src/main/java/d0/e0/p/d/j.java +++ b/app/src/main/java/d0/e0/p/d/j.java @@ -378,9 +378,9 @@ public final class j extends f implements i, KFunction, return c.a.invoke(this, obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16); } - @Override // kotlin.jvm.functions.Function19 - public Object invoke(Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8, Object obj9, Object obj10, Object obj11, Object obj12, Object obj13, Object obj14, Object obj15, Object obj16, Object obj17, Object obj18, Object obj19) { - return c.a.invoke(this, obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16, obj17, obj18, obj19); + @Override // kotlin.jvm.functions.Function20 + public Object invoke(Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8, Object obj9, Object obj10, Object obj11, Object obj12, Object obj13, Object obj14, Object obj15, Object obj16, Object obj17, Object obj18, Object obj19, Object obj20) { + return c.a.invoke(this, obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16, obj17, obj18, obj19, obj20); } @Override // d0.e0.p.d.f diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java index 4055a16c9d..4244e673b7 100644 --- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java +++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java @@ -29,8 +29,8 @@ import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; import kotlin.jvm.functions.Function16; -import kotlin.jvm.functions.Function19; import kotlin.jvm.functions.Function2; +import kotlin.jvm.functions.Function20; import kotlin.jvm.functions.Function3; import kotlin.jvm.functions.Function4; import kotlin.jvm.functions.Function5; @@ -102,7 +102,7 @@ public final class b { arrayList2.add(d0.o.to(d0.z.a.getJavaPrimitiveType(cVar2), d0.z.a.getJavaObjectType(cVar2))); } f2652c = h0.toMap(arrayList2); - List listOf2 = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, Function8.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, Function16.class, d0.z.c.a.class, d0.z.c.b.class, Function19.class, d0.z.c.c.class, d.class, e.class}); + List listOf2 = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, Function8.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, Function16.class, d0.z.c.a.class, d0.z.c.b.class, d0.z.c.c.class, Function20.class, d.class, e.class}); ArrayList arrayList3 = new ArrayList(d0.t.o.collectionSizeOrDefault(listOf2, 10)); for (Object obj : listOf2) { int i2 = i + 1; diff --git a/app/src/main/java/d0/z/c/c.java b/app/src/main/java/d0/z/c/c.java index 74a6049852..187f4c36cd 100644 --- a/app/src/main/java/d0/z/c/c.java +++ b/app/src/main/java/d0/z/c/c.java @@ -1,4 +1,4 @@ package d0.z.c; /* compiled from: Functions.kt */ -public interface c extends d0.c { +public interface c extends d0.c { } diff --git a/app/src/main/java/d0/z/d/e0.java b/app/src/main/java/d0/z/d/e0.java index ea653c6815..857fab9b79 100644 --- a/app/src/main/java/d0/z/d/e0.java +++ b/app/src/main/java/d0/z/d/e0.java @@ -18,8 +18,8 @@ import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; import kotlin.jvm.functions.Function16; -import kotlin.jvm.functions.Function19; import kotlin.jvm.functions.Function2; +import kotlin.jvm.functions.Function20; import kotlin.jvm.functions.Function3; import kotlin.jvm.functions.Function4; import kotlin.jvm.functions.Function5; @@ -172,10 +172,10 @@ public class e0 { if (obj instanceof d0.z.c.b) { return 18; } - if (obj instanceof Function19) { + if (obj instanceof d0.z.c.c) { return 19; } - if (obj instanceof d0.z.c.c) { + if (obj instanceof Function20) { return 20; } if (obj instanceof d0.z.c.d) { diff --git a/app/src/main/java/d0/z/d/f.java b/app/src/main/java/d0/z/d/f.java index 714f6ab3da..0fa068c62d 100644 --- a/app/src/main/java/d0/z/d/f.java +++ b/app/src/main/java/d0/z/d/f.java @@ -29,8 +29,8 @@ import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; import kotlin.jvm.functions.Function16; -import kotlin.jvm.functions.Function19; import kotlin.jvm.functions.Function2; +import kotlin.jvm.functions.Function20; import kotlin.jvm.functions.Function3; import kotlin.jvm.functions.Function4; import kotlin.jvm.functions.Function5; @@ -123,7 +123,7 @@ public final class f implements c, e { /* JADX WARN: Multi-variable type inference failed */ static { int i = 0; - List listOf = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, Function8.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, Function16.class, d0.z.c.a.class, b.class, Function19.class, d0.z.c.c.class, d.class, e.class}); + List listOf = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, Function8.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, Function16.class, d0.z.c.a.class, b.class, d0.z.c.c.class, Function20.class, d.class, e.class}); ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(listOf, 10)); for (Object obj : listOf) { int i2 = i + 1; diff --git a/app/src/main/java/kotlin/jvm/functions/Function19.java b/app/src/main/java/kotlin/jvm/functions/Function20.java similarity index 52% rename from app/src/main/java/kotlin/jvm/functions/Function19.java rename to app/src/main/java/kotlin/jvm/functions/Function20.java index a4573c5b75..691b87a588 100644 --- a/app/src/main/java/kotlin/jvm/functions/Function19.java +++ b/app/src/main/java/kotlin/jvm/functions/Function20.java @@ -2,6 +2,6 @@ package kotlin.jvm.functions; import d0.c; /* compiled from: Functions.kt */ -public interface Function19 extends c { - R invoke(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10, P11 p11, P12 p12, P13 p13, P14 p14, P15 p15, P16 p16, P17 p17, P18 p18, P19 p19); +public interface Function20 extends c { + R invoke(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10, P11 p11, P12 p12, P13 p13, P14 p14, P15 p15, P16 p16, P17 p17, P18 p18, P19 p19, P20 p20); } diff --git a/app/src/main/res/drawable-xxxhdpi/img_age_gate_failure.png b/app/src/main/res/drawable-xxxhdpi/img_age_gate_failure.png index 89cbebf5816ca925fc004000012698b226039fc9..8d4c0a7a3af822987ee2c660564c9b0d755de3c7 100644 GIT binary patch delta 45 zcmdmTnR&})<_(`3nA)-?e`$zj+M%^Mu+cw5#B*Ch;>@dV>I^{O>FVdQ&MBb@0NU>o AOaK4? delta 45 zcmdmTnR&})<_(`3nDVM8e`$zjnxVNlu+cw5FVdQ&MBb@0Nia7 AV*mgE diff --git a/app/src/main/res/drawable/hub_events_header.png b/app/src/main/res/drawable/hub_events_header.png new file mode 100644 index 0000000000000000000000000000000000000000..e13605aa7d2d5216f58681c3d881aba3c58f29bd GIT binary patch literal 13220 zcmV;VGh57wP)MNp6$sJj(#eW(jtwU5uQwJxpg|Mum}jjBxEJqOfpGkzvuVIon#WSf+$I!d|$75B{TQV{mi-F`#Im` ze9t+8lPt^blQvz*vs9I0kq|N;DQqYEHzA};N>QW;);#_T%ah;aQu37>ZCE`^QI$mq z@{tUJ_TfTOgkX(0=O5pweT5~`1}sIg2*`&)&^~Y>C<4|@%@I$Y{M&sp3HB#fI4E4hfjMlPMH} zDMPt^LVWj`P=#R`mSGtt*{}@DP!|1A{_#;J!R$PRahVF4$qI?FkvvX$ous}=rSPE2 zSLG`8&2k88#{%i6Li`wr$pA}2$B) z^?puFhW1Jhhe(y%;LsaGf^0@Tq}U)nrjJ`-)LwB>+WW>9sBsQWvJE+soi$y@;(3OS z_dDvGd{|t|k8L|Jv}J&Z+OJn?3bHs2t!YI+My{ZGv`1Ss1G#Ty{l#*6iFeiBT*(Xcp5nKCXHa82Kekg*#9B~ z+W@{^s$AtyVWMRw2^P-Q4UPtmyHs=kJPq*K{m^)@%i&R}T41ubqKy@Q-OIh}53_lX zlU8r2>vb9rYTx%XKuo4))dqp2Cur8EonS5A%hAuwT?NHZ~fXZTQp>&ou1Bnk;FG)-$#(o0L#j->|M( z%REM#HJrwlVM}&=Bnyv&y}GSy7nr42creSz_hTYIzoxR8HNSg-ZEqLR+Ui4ZOT?ak z4x3)vi)yg*eaD_|*Dov%b;0@WgO%_&SUBaL8&k#1gs)gzawZQKpU0l295PP5natV0 zB!2YyWX=6;2f@5er8FLV9arf_+JYvw)s5?Z{o0~1&Z#HIRg8&Pv7@ET*F;muizQ01 z`}s|L{qdK0^;$Nx*w=uE0181qd2wf%zSBpIj27$ZANxc!e%k(WwcB`BNGf2}oN?EY2L5^bLo}9^^5?sL zg}$Lf_@+*L`S>G|qVlpBb!A|2@N#-WbNh?B1 ziMut>yOp18;f^0Ak(*%zz^d;dWf$~7b0r`mg#M1iVvJ-2k51M5)DVZfP81;!3e3LY zVn%&`8bxhx+|f>q@gZVj6%xl~a{j&lg|L~Z?qLd8NY%#DAVTP2k{uJtw1>XDR`z&v z5jwnnl~0{>@Owk}Tiu+RWG5lcM1svstl7krys4y4nniqi4h5IpfhxNMWC60 z3?ZdNc2aL^NW~TC8XL!DCTo3>($;gfG29Os2XS^`(EhY`_pPU@j8HhcxUJZZVoPWK z@~io3{j(&G8Bg5EJn9a7NxH$w?7LpVXw)O6r1q;2b$hz!kJ~er-@UsS&OHaZS7pQ) zJe-%dgY^}?*DfAu3{qdVi+4Y2!epF)g6x}QC&69p=n%WPignt|H3^}hL~rQ--ZzO} zNEYmhH%zhy9G<^!HuhJHnaKpt<*Jou$m;%j?tX)i#uuAx&stJ zyk1Y7$4hNV6M^rY1wd-N(rbdHH;ehLO1NaI%k-7b2FP#hZsDSI%$aPZ=%9z1h5!c+ z`#X+pJd)3qj*TRm++Dw9utegs@3JEdTQH;HXjid`5E3Ck2;j5POo*~j(o&6oY*jd^ zV@9eH5l(Ccij#?JiKZ>VPpmW#*kTTotRHCz$4ZHD-AVSPN8-6^1^R{(goqqBj~j(| zUonBIDo_-nGm>b}9yfUXJ>q1A6D&Q&e&4Ee#7g0kbP3WYK?iL+B(1GFFdUsutETp; zH@Nunv#H4&N6`T<3L#4Ol@qk3v%O(FKS=xZC}w7cW50^;w0Z4r+|jX8MW6{GI+0AM zRJVf3W#q_~VrpyZ(Z!jG%}7A?1#lib!sKxm&|nMUC$@X+XKL@1hDmnJ@>RLokpPJ@ zi4IGnDk>$pJMp%KuvT^rlJ)U6qUX%$crPV1mutP8&8ko~WjnFu+1Q-P2r0S@6MW|+ zYp+j?&BRw}!Mn2+=>wsFR3Xh=*NtRub258eb`C7Lg%M*%GVfx~+H_bNp}mCA{&kN%h%h?Hm=q$%e1`U2R|}0*^%%`Y z66T#sNCyWRt1$-RyIHaJtm0rM*`RfB+k6_)+Gjtvi_3n5pgxE`){1UkJ|WpVIfQ@_ zVZB%sJ>N@A;c(8Ed_B4dDP%|8Vo$>a-@d!((TJwEphnL^hO=-o{4k#5-OhC_FJX~g z({uh)7U4bbCsfz8@cd6!@$x+{;XPxCX03fk_4LV;BZNK)?qZ8KGW)q*rkT?*D|!g0 z?^Tlz;iyM%j`(}gwrH{@I7k_phQVZ@-qT8|YU}1Iw%0B8G)ypT$p$DNe;HzIroxo5 zlEoCNhg7R=U^w)JF` zQ~^|NgZR-HXXfMExUnPS)-JPsyRfKU?u)&$D?i80AvkUhBH%+BOp&C5Jj%6huZuhh zB~_qJ#*8*=mutloRdMa z7A-c5Hft60?J_RO#4jf1a&!6&&el(0WLpY>5+k8X9pzs&vVT_AUVw2ncoJP?jNv3}ZA) zCZqw~>mt8%+5a!?caFUPqT(?mfpuo2M;A!4LNx=r)WX#5kz`7{6+5)yq&BazA!2om zdeG}M!s!$klcF#_A%;n&6p|VeuvaB9s&N$2RW@2m1DHH!gevfb2b>dQ!EA`kl!l?P z6v3b;Sz)otyE}r!=nedR#thO;)-K0W&E^4RxjK6LsAwLVIt!~&;oTjflV`=+rFNHA zF|W74DK~*79({s9pBy3DB!6+gm$}5Zk=(5Zkj8lJI{GN>x+lqswM$c*w$y-5iOi1f zoVbXM0-GIT!j{ggH!&e$Bp2k)WqQhlZaPehkIag$Ya0AkY)Fs{;MJ``%4;QQW(yDJ zpT^AS5s{2rpl?gm+{s^$GQ+qLMpB|ol-J4*D|ynT_zf+^Zb{Gx5@qrTlr)f0{TRuQPVGQEbo3!h=%e5s827%PLwCtZz519!N?9{Kt zhLaajR!B$$-BFH-qJY{dRJB^P>v;Uy5(Yy-hD60jn-Bi@ypI*<8JL=DoP#g$BS^^~6GzV;dxypm<0)wZ4K@WU-A52=J%>g^*MvNo2 z;VXL`wL$Z@Mg}Xnx%pXq!bqt;1%$v6sKzAyD6vtP&btiLyzhsDp#xC($e?Ln`>g1! zq)0|kO3jrw8?=`{2zmn~CWFTV-ZqU`)@bd##%4%}1)b2ci6uuEGBRY!s@i<;w{-y) z%$6*it>?njbS_LyXIou8z5tjE5DbD|52^%Jg+{j|J4F!H$wm3+ra+eopo5BNg%4}7 z)Tj#(S*H>E`_l;SF2Y~9lhEOE)T#8GI|Gp19F_oC(|4l)U; z8ZlCAT71@?NQ^SU*mO;2yUVoCqOA}Y6P}P6)78bSZ0J4#beLq{g6p_-PpD&wx6_g$ z)#dtdYZL*B4zg23mrUi5SlqPu4K0oeFY%_Il#hPW0QRt`+#X)sv|&&;ug0atQSD2- zwUbRJAU~(?Oy%(6rr)8oFY)&3)*xfE6!LQw5@QvzIwcG0nC;k)i|%(ZWZNg!i1QvQ?Z?&)-S!FAOwAFc|MnyU zkU^G%bPX*(O1jh_s|I$mT#mps#2!E=QoWV(kMbaL362J}D$ybE~CP zmExu$^$bdJQ-4;h!SXe?SdQ66l5bvDfDo%;@U{;qLCO{4yoZjteT4_*JajxU=-U@! z#njQ_q`A0*Vi&w+fAlO9f~6qy1;REMTtg5=Qiyf5n4Vm-QhX!VNWOX9GK5%)ARoy| zZyy2|QWl}eb+lTZ49AhjErrE$8462*d>91n(_Gm?1nYpcQ**>nb8UxZScYX-hGkfW zWmtw~ScYX-hGj5{l(Ildxmrr;l$toh?;XQ;XITHk^38AX?XqvVefTc@TkC&iAG%kE z_5aOp@UqT#)ai7}($Z4tbUKf|**6Z~t$$1XFCT#Z)&Hyd7boZ@mk=J1eD&2=*|KE| zE>{y%rcCDg>#y&8std>wVtCx*--uuW_{77-BZMb^{bT4ng+Yn%n>bW2fX zfsn!`MY#RQB7rDU)zJDE9=HGd;`grq`=5{d^-aLHrhm2iDj|XtfLsck5&nMrV0RHv zBoAM;UK-?jw%=4l7ak)b1)?3RytrI0{`%Ly0r266A9gVR zvBw_meCdLL++K)yueV_=zDePyYDl_K?-Cr{K3zT#T<4N}ULQeZ>X z06Q-=FA(`azM|-sExxw7R0w6|KOc!cVfeD@?NZ;r{((|i zedS7tSgWKyEl&u!P9VO%d(U;Z10AbXNkRK(jUR@fH3!?=Dimw)%LUnNHWn2CvTyw_&5?wjI3E22%VhPk6(V&_$?>~}Cmvt)K(I|5Rq(m{qS<)rYDl}>O2VQd zELl2$HP6M~x?D+)P*tv5jOO{;CqmMp%^eUg$cF^aM<;=%#VAXgPtkG>YN0nkrZPY zZZ(dLuKz&xK7pYWU1;9%Jm`zBb2^rt^YW&1X1wjdQ>Q(Sv1wG)rE>eDzo5+<)p73C z=e|g${bfuhg)t+wHLkz>dMv+Nb3+Nb(EQ`V*9f+;UH@jELSnO#*fu>@uMVqMkJ+!F z4=U(Yv3l`&%U4J#=K&i##b}&*>S^rUxs$7}zKTa4d8G43jWVqNS9^cJgBw9OzJU)= zA~1aac!(AzSh)QINms}L;dfkVk#nWZtTPpMCRnIdPt%q(nm$aUX5%5OakFqYzrobi zaahK=T+heeYL`;lfD(=>488Nt-|^aOuMrm)$Gh*o)A0ZbA#!@YHOp+$94KtR!GYcJ zC>zd3Z#Hy0*Hha91v@aGb+~t;c@0xV&YA%S*o$s-+RUxG!lOHw>1kWI^z^4mjV~uq z5#sGVi>PSGVY~ahzAjhl4TPqyTVp>i{E=y8{Ot0_7!g|uO=V!q;j@D?xcAxXv`%b7 zAvZ04l&0!(9(l#hE&p#q$8}aceiQr4MwfU4p=rm2?_6m&>r7v?w|{7Ded9JN00iq*=)S?&fD!Dmk1$7_N=j`c4-QJ(G$U>6dbM_MN4ZUzL1GF zkBN$^THLKV>`Alm`K?&Z%`BSpaO6Sv>ZggECkNbq4L|gSt0lql+O}({sLv%3H1%qD z4SFBhBfjFinNMPmuIo;;PWT<}qDg1Ez4HU6`V^e6j3oQDY%aI^cqMrZyJ|kfXdKPl zXPdBInqae+|EWL-u~|yF3b?N`%o%5V4~HYWBUTFszAJler6qJbGIE1Oj2{_Lp@;n> zEXmP$KAOTS^>$_z>?JKV(9L{f3EU10cutq8O?NvzOxc(`t_VlQ*V;K_;Ntk_c=F?) zLf?C0IV?uqapQkomCY|7{4JLhY+%8h4d5!}lre(Sr+mtnUytUhb6y6Yn>ee2$vO>R zK*eOxwwjzWdN2FSM(0?Jy4zr2bH4tg`ECK+*17%0py-`oTK8;oU-hqk^)G~I*T3vd z|FY(40cschw@XW#m4CdvlxpX6Y&IjFwg$>8ny9D_;`jN9wp20e)G0(+6n=2p|$PHSC8Ym{Whk?Y03+zg6GOyeC|@XX_N;?Y_jGWdE2In`!8}yDOUo0 z4LGh6Lagi~4(n##J&(*Js%JSt)g%!xQf=$6$=d*%{u4t>F|FoF>^wA)*%P*cyP7(Y&z+Co%$cWr$bz|=xA4)fQ+V*j<>3TmX#Rlk zH8=6=&Yzw0c@oRs$?Wwz4f~D|obE13`l)rAE`C|N{%`ALSV)HTzp4*6O~Y5>Q1zKK z1>!k;*v6yJ&!Vx}jxEkWO0t>HKi@)8;TBTt+iCMCH2da}mp7N0r%dLj7yXvRxT?tA zhxr51e>;BZk#Vej=hpySb><%!nYstJRCqZMOHnY23e|u~ktB#9=jhywX-ejWcmD@R z%08}`e@}Pqhw(K_rgZIL##C7OWupmeTx26&gCe;)CyuKDh(QggsKJm!Z?WD7EEhto zlv1t<_f`wT?t=?h2Rtc6?~~?KHL$XMr~59w`xS-U^Jg1xj7X){l!URRoILMG>`cBA zlTlB?*#h^+NBHHvUY@__^={u+LM$3kx;Ut;9Ec14==v=F_Kc5<&-#SQidl?y%pk|t z!0eV1DvUPXiyPbZE(_%w@E14TEspLS7jI5u;ntL1zjLIp5^<)75&vn=DcozkFEj6h z6-ViR!BP5O+nfGFl~)Q?4XzZ5ph15*|E%}{WzB+yJ$}5qe8`XlB>sR(RrzOl{Z{5o z-_K1q{+3_;>Q`i%-{)|7CYc#gG&YauOfoSL{ddM!gzV@O65^`Z5wx(%m%_pId#HYR zA3|>=?Yglfo;!gTf3u0$udB%$m5yoF$40 zuVvqJMeKdHkoqsHm$j_iu<5$$`y4`uQX#}LA%tCMVi!Uz?~7pCuMrD-`g}vO_O_AR6ICX7bG%n5~9Ev-l?_@L-Co_XsM{G|qr!N7p=g^1`s%B$msS8{qK zm{e7&3d=D5FhKHu+L01&`MrG^urYPqrku|{ez`2H|9ByU68^iQFZ~NeAQZ6x{Ycd4 z3-S4z7#FpT=;|s$0ToqMQB{f86T%V|k50JBpOQy?eLY*YY+>ruNqAaz;`QlhaHkxt z|0VtDza78D8^t@@XL7LkFt5LS1228)=Qq9-nxsPV>8Fu5el2;Ke>Jda8RD4_Z{+Sra&fjK_lU17cHUVaI|Z!^x2BNTY=kp&;WzVOPS2qH-OQch{>q3{?(6}Jb5yWjg45XF~r7Y z6AZZcV($o4RUVW6+wnJkHiwO$pGHX9$;iEt>wokz%}rXznV+7-%AYoIpztCVjLFqv z_3yzI=WZi;Zz+bK*tp~VKXb>!7vK#@aHvY#)axio zwl(m(MZe-Fhwo?Z{_VJ;Vvh}9(dB0!v9N0GSVmSy_3X`h161rjMB?31#GDa@lqb3krIH2u3SmY^X`jR=^_tXEvnqgcaoKiStKD23HJc;P6q1|WNb)&j zu(j$zs6B(*k3igb|rC<8Mm z)%4;H^*zl(_OT|#yE_*kgi2!E5%RLMg=ck%%~`N2<;v+>|yZ&YKlb90H`KT(3_l=ja{N79W;QniQ{$Gojd(QiKz0stkO(qc7%B;C} z;S1;q`09zV){&Yqlh)Q+-ua-4rT;OqlP5kf{FKC61d>PoEC5D{&GhrjU8YNTSnX8IzksVxAT!IHLm~PF(p|gFjB|G45T+7k|Ex!uu9- z=#@KZ*!?aohj(>5za?O0OU(>+J4bUOMM{MSUcZg1#-1~6(?@ONrVCeLv!0lJ!F0M1 z7oV{K(jxn=eR?>+lY5LX@mi?QhF7=2jss9+ggI;ZV#G39rI)mGw^EZh;#gbA%cs`x z+{NV_Uf^Q?L?62yes-n>`64;UXR#_@BpcXq#LDUytXz0aGJjbUi>h{y?WF4Ai4XK# zPbHt@8Bm2s*Pqgc+ITOYR{IH{u%%kz;%k16r?rCGnvZa|Xzp8P_H2T|I!a2LIan$| z(X5cwnuH^J^f6VKv`a#a6N%tl%MnxrQPwnk)sfu>5Bux+r0pP9y@5HY4vaM(V#~eM zG}jaD(=)=6hS6I`V8>)I24K$^&FH*6N9qwuM`b{*%|}qDq7NzLdlDcg2i`x_y?iD& z5qoZ8m(O0=mN10>#uDF(pC>1^22N`C(-fE*^&wE|7jtN~K_^OYdW+}g=jd%dg z&)mYbV_zUj?*q}#BC4t=Mc20iTD&pb{qo)X?^XYW)!cokU{d@h?zpUse{R2yZTsgP z)qai%e_YlflI#sYEZAef>88menS0|}LV0u0sUG&m5^cZ=k z1+njP;i`^}vWtGh$PJgAgWkI(YHP zDJ;MG`_%5Z249^KQ<6W7e~kK9ov49&Y^ed<&S<1g8z>Fh@Io59Cyg25Q=P&&|(R3AiY(4^LZuw{S)}8|NRB3 zp zadSHe2C$+0d))u!lJGO!H$F43$yP^RMt3L$^_cME<2vm& zJ~9=6v&Nb@(%|Ox*I$R$dIrX$3nV{Cd6nj>G)CxRDB7%5 zV42L>w6yqeHJ0+pmRpF6ZNo3~2*}Y`EP|^RkEXfdO`Jz%7*#Pa{OptpW{lev-U>NL zP4x#z6;yv$lU?4@gg3>)@)v$i(=T&*W?B_b_;SY1i}iTl-Ak>%ICSX%4!M&M>A%X{9P7W?aN2O-DFAV<6s<;5vK(OQik%3&Tl?*73U|6G1oYN(Sw4RQIU{O_Ho0-O+PQP@60KT4 z9IFjX|GJ&h9O|O~(-XGRymuQ9-dn}H?|w{X?oC9+Oro{bkD{}XH^Iu4OXjfl=>tSZ z1(-C>g17Y$iavoFXP0Ne)!$%rXZ)M5c!<3vquJQzr+8r=x@Z$$|9%73@u^sH638Ai zlJt~RJ~?ujPixDOof1(K6g_v`>m%8IFl;4UkbcA^@*do*th29lsZw@Kk=UEv!qaC) zN<_9dNG|)_z_okqJXM#<=9V-*^Q7@kosW;bV<_~c(d16k9!gU)B53ZM!tQsTlgL@) zl9FyyG#t^Dnrk|CE{AeYrPx`;1>0W0H}R}U+_w8&lJYO;_1aGt|Da#|b!+S{Rh8ZF zr4HPAdfa36xX0^h%GWdU^qr)|AMP>B2Vga|kRD%tOzl4!|4@a4+WI(XDhJOIICT_Q zEl{=vw%!9u3rx;I+N_Xe0$L!?0aHe?zhpFrDzlFX-=vr{{Y!9tY9Da;l$m&hg;Uqy zZCXcj3Q>aJ%pFdY}`NDIVGG{aCBmW=4PzZk@grc`oUNeTj+~ls!NM*b} zmC@#ua5&TT8CVo`gk*bp*JnGywGP6yi$WFa&~Zci!M9GSqax8u+@sk%wl5WgoK^3gi5y1z@upYr?YR2V@#e4Sky!h3J z#AHrED3M%E%B;)!P9iWcd?D0zpzDI~N!JmycFmsoqVmUQ)m zbfJDXSa?3}R=L=D_c|1A2)YNpyK#B_2yS`yUUZ6zvo(ggrnnCCS^8H8DHqkqK@$pA*qc^5-`n>YE4k+F+q&~e_ zN**}+^Ko${VL}Iq$(@5fDz?jDqdqFG@xVZ*n{>ukgvz4te+Y^m^k#_71X~J3 zJHZhT20cmfX0E+5l0`dkIEPh_{hT^iLL_g5958;>ODP{zy^#8Vdr!iOar9;H85K<)vP{p8j`)m%t64bm~=IU z%41QO;?u8`=D@TJpna(Bt<9@diR5z-;PX?qyEMr0S!mNIU&%fYJb#W5V}^ z)RksMStxbF;U2H=Hn<$EYr!u~v;?DxHnf1j07n&>)cDfa8JY}sN{^fpeXRJa%!;yb zY<96j%Pw~Ag`&Vd3STLzA=OM6<%lBKJpIk*5K_!-GA z%%%WdpPqofp8BfiDc<=ZEzMssd7K50H^jb!O^g{C!(W~{pSV~oMW~bkmKi z-uEaATp?WtekdeqaR)J5jQtNeNgY3LNg=n{O`J|Gxxrqus+;W^C;o6=DaR$ke=e zP^=KW7%bldanwC&dk=TrTipK8byPPbm!MORYtp7;+@_q6PIiq&>DLg_m9 zD0O-gd6(s)H+S^cC4M*a*IXoyNB=nz-TR%1_WOrVC*a-AsPwOS?d>vNe7%gEtY{8y zTZq%;XZ-hGWu|T-f4_AuS&JLcCQXLs57dfvmXue1l_PZO`v`IXq&GmK!H0cf@&LzF zq3n>iB;XbEYcBfV(jH0HK{Oq!>o?d7O8(IMREOyk>NxY%O8)SKRu%KWgjx>PY~Ot2 zj77_jhhUwF<_%d_U;EL@f@*gRA-|_fbw@vDdvo#nKP)d@xAM60&t2_tgkUv9rk{K3 z4`WWuiUj4UTNrKrl+6uiva>lK0Zd31?5UNT^|1VS2-f*Q1N{@g8A!zMAK1;We_jB# zpMhay?_c!qla>3Q*!+us{Q4U$Kj0X*$q~{kt3jL*c|IhKm46^Uz55Wx+*_v;JtC_8 z8QZK2u;QWf#5dBvM86ts;hK);v+QsiQ_p&xCbyr}51hu5%SLHd_=5)09=d?|Sd+B< z{*%qR#FiDuL$FRnbLh?L>cAJJXSiSeT;$!e2vbVzKsmNK7!)hEk6&4Obj;SHOjz{N zGH;prcG1h;Q)Xj`oRlK=9i9&08Y6bBdh?6h?&k!_`D;DPydLlE4ZGfQB+ppX54ofZ zSoPlWs1t^N)@si(;C4@anWJ*^W8_|XXUDN@o1n=HF0Tx~S6nVnXw{2XoH%@0eZ?{< z#cg*zSm*fls%Hec#J)lT7utNS2Tl}z=7del5Xx-`;Q%RWzy1kHIe$TjuE~-4cg&K; zSffiwRy}goiNg<8U$IO<+y=rSLqhDk&B4^wzi0Zi1h&3@P8a1j{c)-*uqS?1@_Wlq z7=F^ZJd0)Fm6DFO# zD0%vVMX9r|oTAg4I`F5ZDz3t6@vY;3{`u#Nrca-~5N%bc_F`gJ__din=4zb~vQ65w zDClckSbgBqDakqa=bNng8ot1VDmG7CJbLY0zfJwt@Pn0CFY>;VvC#9(m?-IRW6i5Oc63%%q)Zpi3^3zQi`=7jb7O&{{IKD W(bo;9Sp;wZ0000 - + + + + + + + + + diff --git a/app/src/main/res/layout/widget_hub_events_page.xml b/app/src/main/res/layout/widget_hub_events_page.xml index ec86cd9be6..4203993621 100644 --- a/app/src/main/res/layout/widget_hub_events_page.xml +++ b/app/src/main/res/layout/widget_hub_events_page.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index 7396a4f06b..14124e222d 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -3444,7 +3444,7 @@ ‏‮Wanna‬‏ ‏‮join‬‏ ‏‮more‬‏ ‏‮servers?‬‏ ‏‮Upgrade‬‏ ‏‮to‬‏ ‏‮Discord‬‏ ‏‮Nitro‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮200‬‏ ‏‮servers!‬‏ ‏‮This‬‏ ‏‮reason‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮recorded‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮audit‬‏ ‏‮log.‬‏ - ‏‮When‬‏ ‏‮you‬‏ ‏‮put‬‏ ‏‮a‬‏ ‏‮user‬‏ ‏‮in‬‏ ‏‮timeout‬‏ ‏‮they‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮send‬‏ ‏‮messages‬‏ ‏‮in‬‏ ‏‮chat,‬‏ ‏‮reply‬‏ ‏‮within‬‏ ‏‮threads,‬‏ ‏‮react‬‏ ‏‮to‬‏ ‏‮messages,‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮or‬‏ ‏‮stage‬‏ ‏‮channels‬‏ + ‏‮When‬‏ ‏‮you‬‏ ‏‮put‬‏ ‏‮a‬‏ ‏‮user‬‏ ‏‮in‬‏ ‏‮timeout‬‏ ‏‮they‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮send‬‏ ‏‮messages‬‏ ‏‮in‬‏ ‏‮chat,‬‏ ‏‮reply‬‏ ‏‮within‬‏ ‏‮threads,‬‏ ‏‮react‬‏ ‏‮to‬‏ ‏‮messages,‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮or‬‏ ‏‮stage‬‏ ‏‮channels.‬‏ ‏‮[Learn‬‏ ‏‮More](‬‏‏‮{link}‬‏‏‮)‬‏ ‏‮{guildName}‬‏ ‏‮has‬‏ ‏‮put‬‏ ‏‮you‬‏ ‏‮in‬‏ ‏‮time‬‏ ‏‮out‬‏ ‏‮mode‬‏ ‏‮for‬‏ ‏‮{time}‬‏‏‮.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮not‬‏ ‏‮reply,‬‏ ‏‮react,‬‏ ‏‮message‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮the‬‏ ‏‮duration‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮time‬‏ ‏‮out.‬‏ ‏‮[Learn‬‏ ‏‮more](‬‏‏‮{link}‬‏‏‮)‬‏ ‏‮Time‬‏ ‏‮Out‬‏ ‏‮Mode‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮not‬‏ ‏‮reply,‬‏ ‏‮react,‬‏ ‏‮message‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice.‬‏ ‏‮[Learn‬‏ ‏‮more](‬‏‏‮{link}‬‏‏‮)‬‏ @@ -3521,7 +3521,7 @@ ‏‮{count}‬‏ ‏‮for‬‏ ‏‮{query}‬‏ ‏‮Explore‬‏ ‏‮Public‬‏ ‏‮Servers‬‏ ‏‮View‬‏ - ‏‮Remove‬‏ ‏‮it‬‏ ‏‮now‬‏ ‏‮to‬‏ ‏‮let‬‏ ‏‮them‬‏ ‏‮post‬‏ ‏‮and‬‏ ‏‮react‬‏ ‏‮to‬‏ ‏‮messages,‬‏ ‏‮and‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮and‬‏ ‏‮stage‬‏ ‏‮channels.‬‏ ‏‮[Learn‬‏ ‏‮More](https://www.google.com)‬‏ + ‏‮Remove‬‏ ‏‮it‬‏ ‏‮now‬‏ ‏‮to‬‏ ‏‮let‬‏ ‏‮them‬‏ ‏‮post‬‏ ‏‮and‬‏ ‏‮react‬‏ ‏‮to‬‏ ‏‮messages,‬‏ ‏‮and‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮and‬‏ ‏‮stage‬‏ ‏‮channels.‬‏ ‏‮[Learn‬‏ ‏‮More](‬‏‏‮{link}‬‏‏‮)‬‏ ‏‮Remove‬‏ ‏‮Timeout‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮timeout‬‏ ‏‮ended‬‏ ‏‮!!‬‏‏‮{username}‬‏‏‮!!‬‏ ‏‮has‬‏ ‏‮$[](countdown)‬‏ ‏‮remaining‬‏ ‏‮in‬‏ ‏‮their‬‏ ‏‮timeout.‬‏ @@ -3647,9 +3647,9 @@ ‏‮Server‬‏ ‏‮Profile‬‏ ‏‮Banner‬‏ ‏‮Server‬‏ ‏‮Profile‬‏ ‏‮-‬‏ ‏‮$[](guildIconHook)‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ ‏‮Set‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar,‬‏ ‏‮profile‬‏ ‏‮banner,‬‏ ‏‮and‬‏ ‏‮about‬‏ ‏‮me‬‏ ‏‮in‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮[Discord‬‏ ‏‮Nitro!](onAndMore)‬‏ - ‏‮Express‬‏ ‏‮yourself‬‏ ‏‮even‬‏ ‏‮more‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮by‬‏ ‏‮unlocking‬‏ ‏‮all‬‏ ‏‮the‬‏ ‏‮profile‬‏ ‏‮customizations‬‏ ‏‮with‬‏ ‏‮Nitro.‬‏ + ‏‮Need‬‏ ‏‮more?‬‏ ‏‮Get‬‏ ‏‮full‬‏ ‏‮server‬‏ ‏‮profile‬‏ ‏‮customization‬‏ ‏‮with‬‏ ‏‮Nitro.‬‏ ‏‮Be‬‏ ‏‮who‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮and‬‏ ‏‮use‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar,‬‏ ‏‮banner,‬‏ ‏‮and‬‏ ‏‮bio‬‏ ‏‮in‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers,‬‏ ‏‮unlock‬‏ ‏‮animated‬‏ ‏‮avatars,‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮[Discord‬‏ ‏‮Nitro!](onAndMore)‬‏ - ‏‮Want‬‏ ‏‮full‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮server‬‏ ‏‮profiles?‬‏ + ‏‮Express‬‏ ‏‮yourself‬‏ ‏‮fully‬‏ ‏‮with‬‏ ‏‮server‬‏ ‏‮profiles‬‏ ‏‮Invite‬‏ ‏‮to‬‏ ‏‮Servers‬‏ ‏‮Invites‬‏ ‏‮expire‬‏ ‏‮in‬‏ ‏‮{xDays}‬‏‏‮.‬‏ ‏‮Other‬‏ ‏‮servers‬‏ @@ -5063,6 +5063,8 @@ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮remove‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ ‏‮from‬‏ ‏‮this‬‏ ‏‮Student‬‏ ‏‮Hub?‬‏ ‏‮Edit‬‏ ‏‮settings‬‏ ‏‮Edit‬‏ ‏‮Settings‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ + ‏‮Add‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮hub,‬‏ ‏‮create‬‏ ‏‮an‬‏ ‏‮event‬‏ ‏‮in‬‏ ‏‮your‬‏ ‏‮server,‬‏ ‏‮and‬‏ ‏‮select‬‏ ‏‮Share‬‏ ‏‮to‬‏ ‏‮Student‬‏ ‏‮Hubs‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮Event‬‏ ‏‮Settings.‬‏ + ‏‮Want‬‏ ‏‮to‬‏ ‏‮promote‬‏ ‏‮events‬‏ ‏‮in‬‏ ‏‮Hubs?‬‏ ‏‮What’s‬‏ ‏‮a‬‏ ‏‮Student‬‏ ‏‮Hub?‬‏ ‏‮Go‬‏ ‏‮to‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮school?‬‏ ‏‮[Join‬‏ ‏‮here](onClick)‬‏ ‏‮You\'ve‬‏ ‏‮been‬‏ ‏‮invited‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮a‬‏ ‏‮Hub‬‏ @@ -6243,8 +6245,8 @@ ‏‮Members‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮can‬‏ ‏‮drag‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮only‬‏ ‏‮move‬‏ ‏‮members‬‏ ‏‮between‬‏ ‏‮channels‬‏ ‏‮both‬‏ ‏‮they‬‏ ‏‮and‬‏ ‏‮the‬‏ ‏‮member‬‏ ‏‮they‬‏ ‏‮are‬‏ ‏‮moving‬‏ ‏‮have‬‏ ‏‮access.‬‏ ‏‮Move‬‏ ‏‮To‬‏ ‏‮User‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮moved‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮channel.‬‏ - ‏‮Alert‬‏ ‏‮Cleared‬‏ - ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ + ‏‮Alert‬‏ ‏‮Cleared‬‏ + ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ ‏‮New‬‏ ‏‮notification‬‏ ‏‮Remove‬‏ ‏‮%1$s‬‏ ‏‮More‬‏ ‏‮than‬‏ %1$d ‏‮new‬‏ ‏‮notifications‬‏ @@ -7593,7 +7595,7 @@ ‏‮Upload‬‏ ‏‮your‬‏ ‏‮own‬‏ ‏‮personalized‬‏ ‏‮banner‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮Discord‬‏ ‏‮Nitro!‬‏ ‏‮$[](renderTimeHook)‬‏ ‏‮elapsed‬‏ ‏‮Profile‬‏ ‏‮Customization‬‏ ‏‮is‬‏ ‏‮currently‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮a‬‏ ‏‮limited‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮people.‬‏ - ‏‮Tell‬‏ ‏‮the‬‏ ‏‮world‬‏ ‏‮a‬‏ ‏‮little‬‏ ‏‮about‬‏ ‏‮yourself‬‏ + ‏‮Tell‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮a‬‏ ‏‮bit‬‏ ‏‮about‬‏ ‏‮yourself‬‏ ‏‮Express‬‏ ‏‮yourself‬‏ ‏‮with‬‏ ‏‮an‬‏ ‏‮about‬‏ ‏‮me‬‏ ‏‮and,‬‏ ‏‮if‬‏ ‏‮you‬‏ ‏‮have‬‏ ‏‮Nitro,‬‏ ‏‮a‬‏ ‏‮profile‬‏ ‏‮banner!‬‏ ‏‮Got‬‏ ‏‮it‬‏ ‏‮Update‬‏ ‏‮my‬‏ ‏‮profile‬‏ @@ -10060,7 +10062,6 @@ ‏‮Restart‬‏ ‏‮the‬‏ ‏‮app‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮new‬‏ ‏‮settings‬‏ ‏‮to‬‏ ‏‮take‬‏ ‏‮effect.‬‏ ‏‮Save‬‏ ‏‮Scan‬‏ ‏‮QR‬‏ ‏‮Code‬‏ - ‏‮Trying‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮your‬‏ ‏‮profile‬‏ ‏‮for‬‏ ‏‮a‬‏ ‏‮specific‬‏ ‏‮server?‬‏ ‏‮Go‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮to‬‏ ‏‮edit‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮profile.‬‏ ‏‮Show‬‏ ‏‮Game‬‏ ‏‮Library‬‏ ‏‮Turn‬‏ ‏‮this‬‏ ‏‮off‬‏ ‏‮to‬‏ ‏‮hide‬‏ ‏‮your‬‏ ‏‮Game‬‏ ‏‮Library‬‏ ‏‮so‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮focus‬‏ ‏‮on‬‏ ‏‮your‬‏ ‏‮conversations.‬‏ ‏‮Discord‬‏ ‏‮starts‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮background‬‏ ‏‮and‬‏ ‏‮remains‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮way.‬‏ diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 0ad7315a0e..1e4f06fc07 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2159,7 +2159,6 @@ Деактивиране на акаунт Наистина ли искаш да деактивираш своя акаунт? Това ще те отпише незабавно и акаунтът ти няма да е достъпен за никой. Успех! Деактивирахме имейл известията ти! - Тайм аут, !!{user}!! Деактивиране на синхронизацията Деактивирайки синхронизацията, избраното поведение за изтекъл абонат се изпълнява, така както ако всички абонати са с изтекъл срок. Деактивирайки синхронизацията, избраното поведение за изтекло членство се изпълнява все едно всички членове са с изтекло членство. @@ -2410,7 +2409,6 @@ За да се избегне спам, членовете на сървъра трябва да имат потвърден имейл, преди да могат да изпращат съобщения. Това не е приложимо за членове с роли. Изисква се потвърден имейл Твоят сървър вече отговаря или надвишава изискването за ниво на потвърждение. - Премахване на тайм аут от !!{user}!! Активиране на наслагването в игра. Активирай подтискане на шума Активирай известия @@ -3425,9 +3423,7 @@ Банер на профила за сървъра Профил на сървъра – $[](guildIconHook) !!{guildName}!! Задай различен аватар, банер за профила и информация за себе си във всеки от сървърите си и други чрез [Discord Nitro!](onAndMore) - Изрази себе си още по-явно в този сървър, като отключиш всички персонализации за профила с Nitro. Бъди какъвто си и използвай различен аватар, банер и био за всеки от сървърите си, отключи анимирани аватари и други чрез [Discord Nitro!](onAndMore) - Искаш пълен достъп до профилите на сървъра? Покани в сървъри Поканите изтичат след {xDays}. Други сървъри @@ -6969,7 +6965,6 @@ Качи свой собствен персонализиран банер и много други с Discord Nitro! $[](renderTimeHook) изминали Персонализирането на профил в момента се предлага само на ограничен брой хора. - Кажи на света малко за себе си Изрази себе си чрез раздел „За мен“ и ако имаш Nitro – с банер на профила! Разбрах Актуализиране на профила ми @@ -9237,7 +9232,6 @@ Рестартирай приложението, за да приложиш новите настройки. Запазване Сканирай QR код - Опитвате се да промените профила си за конкретен сървър? Отидете в сървъра, за да редактирате профила си в него. Покажи библиотека с игри Изключи това, за да скриеш библиотеката с игри, така че да се концентрираш върху разговорите. Discord стартира на заден фон и не ти се пречка. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 97de0b1eb9..0a7bd69dac 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2164,7 +2164,6 @@ Vypnout účet Určitě chceš vypnout svůj účet? Po této akci tě okamžitě z účtu odhlásíme a nebude pro nikoho přístupný. Povedlo se! Vypnuli jsme ti e-mailová oznámení! - Dočasně zablokovat uživatele !!{user}!! Vypnout synchronizaci Vypnutím synchronizace dojde k tomu, že chování při vypršení odběratele bude takové, jako by všem odběratelům vypršelo předplatné. Vypnutím synchronizace dojde k tomu, že chování při vypršení členství bude takové, jako by všem členům vypršelo předplatné. @@ -2415,7 +2414,6 @@ V zájmu minimalizace spamu musejí mít členové serveru ověřenou e-mailovou adresu, aby mohli odesílat zprávy. To se nevztahuje na uživatele s rolemi. Potřebujeme ověřený e-mail Tvůj server už splňuje nebo překračuje požadovanou úroveň ověření. - Zrušit dočasné blokování uživatele !!{user}!! Povolit překrytí ve hře. Zapnout potlačení šumu Povolit oznámení @@ -3429,9 +3427,7 @@ Banner profilu serveru Profil serveru – $[](guildIconHook) !!{guildName}!! Nastav si na každém serveru jiný avatar, banner profilu, informace o sobě a ještě mnohem více – [s Discordem Nitro!](onAndMore) - Odemkni si všechna přizpůsobení profilu zakoupením Nitra a buď na tomto serveru ještě víc vidět. Buď tím, kým chceš být, a na každém ze svých serverů používej jiný avatar, banner a informace o sobě, odemkni animované avatary a získej spoustu dalších výhod [s Discordem Nitro!](onAndMore) - Chceš mít úplný přístup k profilům serveru? Pozvat na servery Pozvánka vyprší za {xDays}. Ostatní servery @@ -6973,7 +6969,6 @@ Pořiď si vlastní přizpůsobený banner a další výhody s Discordem Nitro! uběhlo $[](renderTimeHook) Přizpůsobení profilu je momentálně dostupné jen omezenému počtu lidí. - Řekni světu něco málo o sobě Prezentuj se v části „O mně“. Pokud máš Nitro, můžeš používat taky banner profilu! Rozumím Aktualizovat profil @@ -9241,7 +9236,6 @@ Aby se nová nastavení projevila, restartuj aplikaci. Uložit Naskenovat QR kód - Snažíš se změnit svůj profil pro konkrétní server? Profil serveru můžeš upravit přímo na daném serveru. Zobrazit Knihovnu her Vypnutím schováš Knihovnu her a budeš se moci soustředit na své konverzace. Discord se spustí na pozadí a nebude ti překážet. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 674191c583..03ccacb2a8 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2159,7 +2159,6 @@ Deaktiver konto Er du sikker på, at du vil deaktivere din konto? Dette vil øjeblikkeligt logge dig ud og gøre din konto utilgængelig for alle. Succes! Vi har deaktiveret e-mailmeddelelser for dig. - Timeout !!{user}!! Deaktiver synkronisering Deaktivering af synkronisering vil udføre den valgte, udløbne underadfærd, som om at alle underadfærder er udløbet. Deaktivering af synkronisering vil udføre den valgte, udløbne medlemskabs-adfærd som om at alle medlemmer er udløbet. @@ -2410,7 +2409,6 @@ For at minimere spam, skal medlemmer på serveren have en bekræftet e-mailadresse, før de kan sende meddelelser. Dette gælder ikke for medlemmer med roller. Bekræftet e-mail påkrævet Din server opfylder eller overskrider allerede kravet for verifikationsniveau. - Fjern timeout fra !!{user}!! Aktivér spil-overlayet. Aktiver støjdæmpning Aktiver meddelelser @@ -3424,9 +3422,7 @@ Serverprofilbanner Serverprofil – $[](guildIconHook) !!{guildName}!! Brug en anden avatar, profilbanner og \'om mig\' på hver af dine servere og meget mere med [Discord Nitro!](onAndMore) - Udtryk dig selv endnu mere på denne server ved at låse op for alle profiltilpasningerne med Nitro. Vær den, du ønsker at være, og brug en anden avatar, et andet banner og en anden bio på hver af dine servere, lås op for animerede avatarer og meget mere med [Discord Nitro!](onAndMore) - Vil du have fuld adgang til serverprofiler? Inviter til servere Invitation udløber om {xDays}. Andre servere @@ -6968,7 +6964,6 @@ Upload dit eget personligt tilpassede banner og mere med Discord Nitro! $[](renderTimeHook) gået Profiltilpasning er i øjeblikket kun tilgængelig for et begrænset antal personer. - Fortæl verden en smule om dig selv Udtryk dig selv med et om mig, og hvis du har Nitro - også et profilbanner! Forstået Opdater min profil @@ -9235,7 +9230,6 @@ Genstart appen, så dine nye indstillinger kan træde i kraft. Gem Scan QR-koden - Prøver du at ændre din profil for en bestemt server? Gå til serveren for at redigere din serverprofil. Vis Spilbibliotek Slå dette fra for at skjule Spilbibliotek, så du kan fokusere på dine samtaler. Discord starter i baggrunden, opfører sig pænt og kommer ikke i vejen. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index abb4992b64..5b2d0fbb17 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2169,7 +2169,6 @@ Account deaktivieren Bist du sicher, dass du deinen Account deaktivieren möchtest? Du wirst sofort abgemeldet und dein Account ist für niemanden mehr zugänglich. Erfolgreich! Wir haben E-Mail-Benachrichtigungen für dich deaktiviert! - Time-out für !!{user}!! Synchronisation deaktivieren Bei deaktivierter Synchronisation wird die ausgewählte Aktion für abgelaufene Abonnenten bei allen Abonnenten ausgeführt. Bei deaktivierter Synchronisation wird die ausgewählte Aktion für abgelaufene Mitgliedschaften bei allen Mitgliedschaften ausgeführt. @@ -2420,7 +2419,6 @@ Um Spam gering zu halten, müssen Mitglieder deines Servers eine verifizierte E-Mail-Adresse haben, bevor sie Nachrichten senden können. Das gilt nicht für Mitglieder mit Rollen. Verifizierte E-Mail-Adresse erforderlich Dein Server erfüllt oder übertrifft bereits die Anforderung an die Verifizierungsstufe. - Time-out für !!{user}!! aufheben In-Game-Overlay aktivieren. Hintergrundgeräusch-Unterdrückung aktivieren Benachrichtigungen aktivieren @@ -3435,9 +3433,7 @@ Server-Profilbanner Serverprofil – $[](guildIconHook) !!{guildName}!! Benutze auf jedem deiner Server einen anderen Avatar, ein anderes Profilbanner, eine andere Bio und vieles mehr mit [Discord Nitro!](onAndMore) - Zeig allen, wer du bist – mit Nitro erhältst du neue Personalisierungsoptionen für dein Profil, die du je nach Server anpassen kannst. Mit [Discord Nitro](onAndMore) zeigst du anderen, wer du wirklich bist. Benutze einen anderen Avatar, ein anderes Banner und eine andere Bio auf jedem deiner Server, schalte animierte Avatare frei und vieles mehr! - Möchtest du vollen Zugriff auf Serverprofile? Zu Servern einladen Einladung läuft in {xDays} ab. Andere Server @@ -6979,7 +6975,6 @@ Mit Discord Nitro kannst du unter anderem ein personalisiertes Banner hochladen! $[](renderTimeHook) abgelaufen Die Profilanpassung steht derzeit nur einer begrenzten Anzahl an Nutzern zur Verfügung. - Erzähl der Welt ein bisschen was von dir In „Über mich“ zeigst du anderen, wer du bist. Hol dir zusätzlich ein Profilbanner mit Nitro! Alles klar Mein Profil aktualisieren @@ -9250,7 +9245,6 @@ Starte die App neu, damit deine Einstellungen übernommen werden. Speichern QR-Code scannen - Möchtest du dein Profil für einen bestimmten Server anpassen? Gehe auf den Server, um dein Serverprofil zu bearbeiten. Spielebibliothek anzeigen Wenn du das deaktivierst, wird deine Spielebibliothek in ihre Ecke geschickt und du kannst dich besser auf deine Gespräche konzentrieren. Discord hält sich im Hintergrund und geht dir nicht auf den Geist. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 4fd3011c69..1fddbe6669 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2159,7 +2159,6 @@ Απενεργοποίηση λογαριασμού Είσαι σίγουρος ότι θέλεις να απενεργοποιήσεις τον λογαριασμό σου; Αυτό θα σε αποσυνδέσει αμέσως από τον λογαριασμό σου και δεν θα έχει κανείς πρόσβαση σε αυτόν. Μεγάλη επιτυχία! Απενεργοποιήσαμε τις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου για σένα! - Διάλειμμα για τον χρήστη !!{user}!! Απενεργοποίηση συγχρονισμού Η απενεργοποίηση του συγχρονισμού θα εκτελέσει την επιλεγμένη συμπεριφορά ληγμένου συνδρομητή σαν όλοι οι συνδρομητές να έχουν λήξει. Η απενεργοποίηση του συγχρονισμού θα εκτελέσει την επιλεγμένη συμπεριφορά για μέλη που έληξαν ως εάν όλα τα μέλη να έχουν λήξει. @@ -2410,7 +2409,6 @@ Για να ελαχιστοποιήσουμε το spam, τα μέλη του διακομιστή πρέπει να έχουν επαληθεύσει το email τους πριν στείλουν ένα μήνυμα. Αυτό δεν ισχύει για μέλη με ρόλους. Απαιτείται επαληθευμένο email Ο διακομιστής σου ήδη πληροί και με το παραπάνω τις προϋποθέσεις του βαθμού επιβεβαίωσης. - Αφαίρεση διαλείμματος από τον χρήστη !!{user}!! Ενεργοποίηση overlay παιχνιδιού. Ενεργοποίηση καταστολής θορύβου Ενεργοποίηση ειδοποιήσεων @@ -3425,9 +3423,7 @@ Banner προφίλ διακομιστή Προφίλ διακομιστή - $[](guildIconHook) !!{guildName}!! Όρισε ένα διαφορετικό άβαταρ, banner προφίλ και πληροφορίες «σχετικά με εμένα» σε κάθε διακομιστή σου και πολλά άλλα με το [Discord Nitro!](onAndMore) - Εκφράσου ακόμη περισσότερο σε αυτόν τον διακομιστή ξεκλειδώνοντας όλες τις προσαρμογές προφίλ με το Nitro. Γίνε όποιος θέλεις και χρησιμοποίησε διαφορετικό άβαταρ, banner και βιογραφικό σε κάθε διακομιστή σου, ξεκλείδωσε κινούμενα άβαταρ και πολλά άλλα με το [Discord Nitro!](onAndMore) - Θέλεις πλήρη πρόσβαση στα προφίλ διακομιστή; Πρόσκληση σε διακομιστές Η πρόσκληση λήγει σε {xDays}. Άλλοι διακομιστές @@ -6969,7 +6965,6 @@ Μεταφόρτωσε το εξατομικευμένο banner σου και πολλά άλλα με το Discord Nitro! πέρασαν $[](renderTimeHook) Η δυνατότητα προσαρμογής προφίλ προς το παρόν είναι διαθέσιμη σε περιορισμένο αριθμό ατόμων. - Πες λίγα λόγια στον κόσμο για εσένα Εκφράσου με μια ενότητα «σχετικά με εμένα» και, εάν διαθέτεις το Nitro, ένα banner προφίλ! Κατάλαβα Ενημέρωση του προφίλ μου @@ -9237,7 +9232,6 @@ Κάνε επανεκκίνηση της εφαρμογής για να εφαρμοστούν οι νέες ρυθμίσεις σου. Αποθήκευση Σάρωση κωδικού QR - Προσπαθείς να αλλάξεις το προφίλ σου για έναν συγκεκριμένο διακομιστή; Πήγαινε στον διακομιστή για να επεξεργαστείς το προφίλ διακομιστή σου. Εμφάνιση Βιβλιοθήκης παιχνιδιών Απενεργοποίησέ το για να αποκρύψεις τη Βιβλιοθήκη παιχνιδιών σου και να εστιάσεις στις συνομιλίες σου. Η Discord ξεκινά στο παρασκήνιο και δεν μπλέκεται στα πόδια σου. diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index 48a68b6b93..3276cddd1d 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -3444,7 +3444,7 @@ [Ŵåññå ĵöîñ ḿöŕé šéŕVéŕš¿ one two three] [Ûþĝŕåðé ţö Ðîšçöŕð Ñîţŕö ţö ĵöîñ ûþ ţö 200 šéŕVéŕš¡ one two three four five six] [Ţĥîš ŕéåšöñ ŵîļļ ɓé ŕéçöŕðéð îñ ţĥé åûðîţ ļöĝ. one two three four five six] - [Ŵĥéñ ýöû þûţ å ûšéŕ îñ ţîḿéöûţ ţĥéý ŵîļļ ñöţ ɓé åɓļé ţö šéñð ḿéššåĝéš îñ çĥåţ, ŕéþļý ŵîţĥîñ ţĥŕéåðš, ŕéåçţ ţö ḿéššåĝéš, öŕ šþéåķ îñ Vöîçé öŕ šţåĝé çĥåññéļš one two three four five six seven eight nine ten eleven twelve thirteen fourteen] + [Ŵĥéñ ýöû þûţ å ûšéŕ îñ ţîḿéöûţ ţĥéý ŵîļļ ñöţ ɓé åɓļé ţö šéñð ḿéššåĝéš îñ çĥåţ, ŕéþļý ŵîţĥîñ ţĥŕéåðš, ŕéåçţ ţö ḿéššåĝéš, öŕ šþéåķ îñ Vöîçé öŕ šţåĝé çĥåññéļš. [Ļéåŕñ Ḿöŕé](»{link}«) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten] [»{guildName}« ĥåš þûţ ýöû îñ ţîḿé öûţ ḿöðé ƒöŕ »{time}«. Ýöû çåñ ñöţ ŕéþļý, ŕéåçţ, ḿéššåĝé öŕ šþéåķ îñ Vöîçé ţĥé ðûŕåţîöñ öƒ ýöûŕ ţîḿé öûţ. [Ļéåŕñ ḿöŕé](»{link}«) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three] [Ţîḿé Öûţ Ḿöðé one two] [Ýöû çåñ ñöţ ŕéþļý, ŕéåçţ, ḿéššåĝé öŕ šþéåķ îñ Vöîçé. [Ļéåŕñ ḿöŕé](»{link}«) one two three four five six seven eight nine ten eleven twelve thirteen] @@ -3521,7 +3521,7 @@ [»{count}« ƒöŕ »{query}« one] [Éхþļöŕé Þûɓļîç ŠéŕVéŕš one two three] [νîéŵ one] - [ŔéḿöVé îţ ñöŵ ţö ļéţ ţĥéḿ þöšţ åñð ŕéåçţ ţö ḿéššåĝéš, åñð šþéåķ îñ Vöîçé åñð šţåĝé çĥåññéļš. [Ļéåŕñ Ḿöŕé](ĥţţþš://ŵŵŵ.ĝööĝļé.çöḿ) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two] + [ŔéḿöVé îţ ñöŵ ţö ļéţ ţĥéḿ þöšţ åñð ŕéåçţ ţö ḿéššåĝéš, åñð šþéåķ îñ Vöîçé åñð šţåĝé çĥåññéļš. [Ļéåŕñ Ḿöŕé](»{link}«) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen] [ŔéḿöVé Ţîḿéöûţ one two three] [¡¡»{user}«¡¡ ţîḿéöûţ éñðéð one two three] [¡¡»{username}«¡¡ ĥåš €[](çöûñţðöŵñ) ŕéḿåîñîñĝ îñ ţĥéîŕ ţîḿéöûţ. one two three four five six] @@ -3647,9 +3647,9 @@ [ŠéŕVéŕ Þŕöƒîļé βåññéŕ one two three] [ŠéŕVéŕ Þŕöƒîļé - €[](ĝûîļðÎçöñĤööķ) ¡¡»{guildName}«¡¡ one two three four five] [Šéţ å ðéŕéñţ åVåţåŕ, þŕöƒîļé ɓåññéŕ, åñð åɓöûţ ḿé îñ éåçĥ öƒ ýöûŕ šéŕVéŕš åñð ḿöŕé ŵîţĥ [Ðîšçöŕð Ñîţŕö¡](öñÅñðḾöŕé) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] - [Éхþŕéšš ýöûŕšéļƒ éVéñ ḿöŕé îñ ţĥîš šéŕVéŕ ɓý ûñļöçķîñĝ åļļ ţĥé þŕöƒîļé çûšţöḿîžåţîöñš ŵîţĥ Ñîţŕö. one two three four five six seven eight nine ten eleven] + [Ñééð ḿöŕé¿ Ĝéţ ƒûļļ šéŕVéŕ þŕöƒîļé çûšţöḿîžåţîöñ ŵîţĥ Ñîţŕö. one two three four five six seven] [βé ŵĥö ýöû ŵåñţ åñð ûšé å ðéŕéñţ åVåţåŕ, ɓåññéŕ, åñð ɓîö îñ éåçĥ öƒ ýöûŕ šéŕVéŕš, ûñļöçķ åñîḿåţéð åVåţåŕš, åñð ḿöŕé ŵîţĥ [Ðîšçöŕð Ñîţŕö¡](öñÅñðḾöŕé) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven] - [Ŵåñţ ƒûļļ åççéšš ţö šéŕVéŕ þŕöƒîļéš¿ one two three four five] + [Éхþŕéšš ýöûŕšéļƒ ƒûļļý ŵîţĥ šéŕVéŕ þŕöƒîļéš one two three four five] [ÎñVîţé ţö ŠéŕVéŕš one two three] [ÎñVîţéš éхþîŕé îñ »{xDays}«. one two three] [Öţĥéŕ šéŕVéŕš one two] @@ -5063,6 +5063,8 @@ [Åŕé ýöû šûŕé ýöû ŵåñţ ţö ŕéḿöVé ¡¡»{guildName}«¡¡ ƒŕöḿ ţĥîš Šţûðéñţ Ĥûɓ¿ one two three four five six seven] [Éðîţ šéţţîñĝš one two] [Éðîţ Šéţţîñĝš ƒöŕ ¡¡»{guildName}«¡¡ one two three] + [Åðð ýöûŕ šéŕVéŕ ţö ţĥé ĥûɓ, çŕéåţé åñ éVéñţ îñ ýöûŕ šéŕVéŕ, åñð šéļéçţ Šĥåŕé ţö Šţûðéñţ Ĥûɓš îñ ţĥé ÉVéñţ Šéţţîñĝš. one two three four five six seven eight nine ten eleven twelve] + [Ŵåñţ ţö þŕöḿöţé éVéñţš îñ Ĥûɓš¿ one two three four] [Ŵĥåţ’š å Šţûðéñţ Ĥûɓ¿ one two three] [Ĝö ţö å ðéŕéñţ šçĥööļ¿ [Ĵöîñ ĥéŕé](öñÇļîçķ) one two three four five six] [Ýöû\'Vé ɓééñ îñVîţéð ţö ĵöîñ å Ĥûɓ one two three four] @@ -6243,8 +6245,8 @@ [Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ ðŕåĝ öţĥéŕ ḿéḿɓéŕš öûţ öƒ ţĥîš çĥåññéļ. Ţĥéý çåñ öñļý ḿöVé ḿéḿɓéŕš ɓéţŵééñ çĥåññéļš ɓöţĥ ţĥéý åñð ţĥé ḿéḿɓéŕ ţĥéý åŕé ḿöVîñĝ ĥåVé åççéšš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [ḾöVé Ţö one two] [Ûšéŕ ĥåš ɓééñ ḿöVéð ţö ţĥé šéļéçţéð çĥåññéļ. one two three four five] - [Åļéŕţ Çļéåŕéð one two] - [Ñö Åļéŕţ Šĥöŵîñĝ one two three] + [Åļéŕţ Çļéåŕéð one two] + [Ñö Åļéŕţ Šĥöŵîñĝ one two three] [Ñéŵ ñöţîƒîçåţîöñ one two three] [ŔéḿöVé »%1$s« one two] [Ḿöŕé ţĥåñ %1$d ñéŵ ñöţîƒîçåţîöñš one two three four] @@ -7593,7 +7595,7 @@ [Ûþļöåð ýöûŕ öŵñ þéŕšöñåļîžéð ɓåññéŕ åñð ḿöŕé ŵîţĥ Ðîšçöŕð Ñîţŕö¡ one two three four five six seven] [€[](ŕéñðéŕŢîḿéĤööķ) éļåþšéð one two three four] [Þŕöƒîļé Çûšţöḿîžåţîöñ îš çûŕŕéñţļý åVåîļåɓļé ţö å ļîḿîţéð ñûḿɓéŕ öƒ þéöþļé. one two three four five six seven eight] - [Ţéļļ ţĥé ŵöŕļð å ļîţţļé åɓöûţ ýöûŕšéļƒ one two three four five] + [Ţéļļ ţĥîš šéŕVéŕ å ɓîţ åɓöûţ ýöûŕšéļƒ one two three four five] [Éхþŕéšš ýöûŕšéļƒ ŵîţĥ åñ åɓöûţ ḿé åñð, îƒ ýöû ĥåVé Ñîţŕö, å þŕöƒîļé ɓåññéŕ¡ one two three four five six seven eight] [Ĝöţ îţ one two] [Ûþðåţé ḿý þŕöƒîļé one two three] @@ -10060,7 +10062,6 @@ [Ŕéšţåŕţ ţĥé åþþ ƒöŕ ýöûŕ ñéŵ šéţţîñĝš ţö ţåķé 郃éçţ. one two three four five six] [ŠåVé one] [Šçåñ qŔ Çöðé one two] - [Ţŕýîñĝ ţö çĥåñĝé ýöûŕ þŕöƒîļé ƒöŕ å šþéçîƒîç šéŕVéŕ¿ Ĝö ţö ţĥé šéŕVéŕ ţö éðîţ ýöûŕ šéŕVéŕ þŕöƒîļé. one two three four five six seven eight nine ten eleven] [Šĥöŵ Ĝåḿé Ļîɓŕåŕý one two three] [Ţûŕñ ţĥîš öƒƒ ţö ĥîðé ýöûŕ Ĝåḿé Ļîɓŕåŕý šö ýöû çåñ ƒöçûš öñ ýöûŕ çöñVéŕšåţîöñš. one two three four five six seven eight nine] [Ðîšçöŕð šţåŕţš îñ ţĥé ɓåçķĝŕöûñð åñð ŕéḿåîñš öûţ öƒ ýöûŕ ŵåý. one two three four five six seven] diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index b9e7538754..2d0b82a6a7 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -2114,7 +2114,6 @@ Deshabilitar cuenta ¿Seguro que quieres deshabilitar tu cuenta? Se cerrará la sesión de inmediato y nadie podrá acceder a la cuenta. ¡Listo! ¡Te hemos deshabilitado las notificaciones de correo electrónico! - Aislar temporalmente a !!{user}!! Deshabilitar sincronización Deshabilitar la sincronización imitará el comportamiento seleccionado de suscriptores expirados como si todos los suscriptores hubieran expirado. Deshabilitar la sincronización imitará el comportamiento seleccionado de membresía expirada como si todos los miembros hubieran expirado. @@ -2365,7 +2364,6 @@ Para reducir el spam, los miembros del servidor deben tener un correo electrónico verificado para poder enviar mensajes. No se aplica a los miembros con roles. Correo electrónico verificado obligatorio Tu servidor ya cumple o supera el nivel de verificación necesario. - Quitar aislamiento temporal de !!{user}!! Habilitar el overlay dentro del juego. Habilitar supresión de ruido Habilitar las notificaciones @@ -3320,9 +3318,7 @@ Cartel de perfil de servidor Perfil de servidor: $[](guildIconHook) !!{guildName}!! ¡Establece un avatar, un cartel de perfil e información sobre ti diferentes en cada uno de tus servidores y más con [Discord Nitro!](onAndMore) - Exprésate aún más en este servidor desbloqueando todas las personalizaciones de perfil con Nitro. ¡Sé quien quieras ser y utiliza un avatar, un cartel y una biografía diferentes en cada uno de tus servidores, desbloquea avatares animados y más con [Discord Nitro!](onAndMore) - ¿Quieres tener acceso completo a los perfiles de servidor? Invitar a servidores Las invitaciones expiran en {xDays}. Otros servidores @@ -6813,7 +6809,6 @@ ¡Sube tu propio cartel personalizado y más con Discord Nitro! Tiempo transcurrido: $[](renderTimeHook) La personalización del perfil está disponible para un número limitado de personas. - Háblales un poco a todos acerca de ti ¡Exprésate con la sección Sobre mí y, si tienes Nitro, un cartel de perfil! Entendido Actualizar mi perfil @@ -9078,7 +9073,6 @@ Reinicia la aplicación para que se apliquen los ajustes. Guardar Escanear código QR - ¿Quieres cambiar tu perfil para un servidor concreto? Ve a ese servidor para editar tu perfil de servidor. Mostrar biblioteca de juegos Desactiva esto para ocultar la biblioteca de juegos y concentrarte en tus conversaciones. Discord se inicia en segundo plano y no se interpone en tu camino. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index e6b158970c..95a57a65f5 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2159,7 +2159,6 @@ Poista tili käytöstä Haluatko varmasti poistaa tilisi käytöstä? Tämä kirjaa sinut välittömästi ulos ja kieltää jokaiselta pääsyn tilillesi. Onnistui! Poistimme sähköposti-ilmoitukset pois käytöstä! - Aseta !!{user}!! jäähylle Poista synkronointi käytöstä Jos synkronointi poistetaan käytöstä, järjestelmä tekee tilaajien vanhentumistoimenpiteen ikään kuin kaikki tilaukset olisivat vanhentuneet. Jos synkronointi poistetaan käytöstä, järjestelmä tekee jäsenten vanhentumistoimenpiteen ikään kuin kaikki jäsenet olisivat vanhentuneet. @@ -2410,7 +2409,6 @@ Roskapostiviestien välttämiseksi palvelimen jäsenten on vahvistettava sähköpostiosoitteensa ennen kuin he voivat lähettää viestejä. Tämä ei koske jäseniä, joille on määritetty rooli. Vahvistettu sähköpostiosoite vaaditaan Palvelimesi täyttää jo kaikki vahvistustasovaatimukset tai ylittää ne. - Poista !!{user}!! jäähyltä Ota pelinsisäinen peitetaso käyttöön. Ota kohinanvaimennus käyttöön Ota ilmoitukset käyttöön @@ -3425,9 +3423,7 @@ Palvelinprofiilin banneri Palvelinprofiili – $[](guildIconHook) !!{guildName}!! Käytä eri avataria, profiilibanneria ja Tietoja minusta ‑kuvausta kullakin palvelimellesi ja nauti monista muista eduista [Discord Nitrolla](onAndMore). - Ilmaise itseäsi entistäkin vapaammin tällä palvelimella avaamalla kaikki profiilin mukautusvaihtoehdot Nitrolla. Voit valita haluamasi avatarin, bannerin ja biografian erikseen kullekin palvelimellesi sekä käyttää animoituja avatareja ja monia muita etuja [Discord Nitrolla](onAndMore). - Haluatko kaikki palvelinprofiilitoiminnot käyttöösi? Kutsu palvelimille Kutsujen vanhenemisaika on {xDays}. Muut palvelimet @@ -6969,7 +6965,6 @@ Oman yksilöidyn bannerin lataus palvelimelle ja paljon muuta Discord Nitrolla! $[](renderTimeHook) kulunut Profiilin mukautus on tällä hetkellä rajoitetun käyttäjäjoukon käytettävissä. - Kerro maailmalle jotain pientä itsestäsi Ilmaise itseäsi Tietoja minusta ‑kuvauksella ja Nitro-tilaajana myös profiilibannerilla! Selvä Oman profiilin päivitys @@ -9241,7 +9236,6 @@ Ota uudet asetukset käyttöön käynnistämällä sovellus uudelleen. Tallenna Skannaa QR-koodi - Yritätkö muuttaa profiiliasi tietyllä palvelimella? Muokkaa palvelinkohtaista profiiliasi siirtymällä kyseiselle palvelimelle. Näytä pelikirjasto Poista tämä käytöstä, jos haluat piilottaa pelikirjastosi, jotta voit keskittyä keskusteluihisi. Discord käynnistyy taustalla ja pysyy poissa tieltä. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 329ad9d707..8f278d5bf1 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2164,7 +2164,6 @@ Désactiver le compte Tu es sûr(e) de vouloir désactiver ton compte ? Cette action te déconnectera immédiatement de ton compte et plus personne ne pourra y accéder. Ça marche ! Nous avons désactivé les notifications par e-mail rien que pour toi ! - Exclure !!{user}!! temporairement Désactiver la synchronisation Désactiver la synchronisation déclenchera le comportement sélectionné en cas d\'expiration d\'un abonnement à tous les abonnements, comme s\'ils avaient tous expiré. Désactiver la synchronisation déclenchera le comportement sélectionné en cas d\'expiration d\'un abonnement à tous les abonnements de membre, comme s\'ils avaient tous expiré. @@ -2415,7 +2414,6 @@ Pour réduire le spam, les membres du serveur doivent faire vérifier leur adresse e-mail avant d\'envoyer des messages. Cela ne s\'applique pas aux membres ayant des rôles. Une adresse e-mail vérifiée est requise Le niveau de vérification de ton serveur est conforme ou supérieur aux critères. - Réintégrer !!{user}!! Activer l\'overlay en jeu. Activer la suppression du bruit Activer les notifications @@ -3430,9 +3428,7 @@ Bannière de profil du serveur Profil du serveur - $[](guildIconHook) !!{guildName}!! Avec [Discord Nitro](onAndMore), utilise un avatar, une bannière de profil et un à propos de moi différents sur chacun de tes serveurs et bien plus ! - Exprime-toi davantage sur ce serveur en débloquant la personnalisation de profil grâce à Nitro. Avec [Discord Nitro](onAndMore), affiche-toi comme tu veux et utilise un avatar, une bannière et une description différents sur chacun de tes serveurs, débloque des avatars animés et plus encore ! - Tu veux un accès complet aux profils de serveur ? Inviter sur les serveurs L\'invitation expire dans {xDays}. Autres serveurs @@ -6049,8 +6045,8 @@ Utilisé dans {guildCount} serveur(s) La politique de confidentialité et les conditions d\'utilisation s\'appliquent au bot du développeur de !!{application}!!. La [politique de confidentialité]({privacyPolicyURL}) et [les conditions d\'utilisation]({termsOfServiceURL}) s\'appliquent au bot du développeur de !!{application}!!. - La [politique de confidentialité]({privacyPolicyURL}) et les conditions d\'utilisation du développeur de !!{application}!! s\'appliquent au bot du développeur. - La politique de confidentialité et [les conditions d\'utilisation]({termsOfServiceURL}) du développeur de !!{application}!! s\'appliquent à cette application. + La [politique de confidentialité]({privacyPolicyURL}) et les conditions d\'utilisation de Discord s\'appliquent au bot du développeur de !!{application}!!. + La politique de confidentialité et [les conditions d\'utilisation]({termsOfServiceURL}) de Discord s\'appliquent au bot du développeur de !!{application}!!. Une fois que tu l\'auras autorisé, tu seras redirigé vers : !!{origin}!! **!!{applicationName}!!** a aussi demandé les permissions suivantes, mais tu ne peux pas les accorder : Faire un gâteau @@ -6973,7 +6969,6 @@ Uploade ta propre bannière personnalisée et bien plus avec Discord Nitro ! Temps écoulé : $[](renderTimeHook) La personnalisation du profil est accessible à un nombre limité de personnes pour le moment. - Présente-toi en quelques mots au monde entier Exprime-toi dans ta section À propos de moi et même avec une bannière de profil si tu as Nitro ! Compris Mettre à jour mon profil @@ -9242,7 +9237,6 @@ Redémarre l\'application afin d\'appliquer tes nouveaux paramètres. Enregistrer Scanner le code QR - Tu essaies de modifier ton profil sur un serveur spécifique ? Rends-toi sur le serveur pour modifier ton profil de serveur. Afficher la bibliothèque de jeux Désactive cette option pour masquer ta bibliothèque de jeux afin de te concentrer sur tes conversations. Discord se lance en arrière-plan et ne vient pas te déranger. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 1f616ee79c..54fd0bd6c0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2159,7 +2159,6 @@ अकाउंट को ऑफ करें क्या आप वाकई में अपने अकाउंट को ऑफ करना चाहते हैं? यह तुरंत आपको लॉग आउट कर देगा और आपके अकाउंट को किसी को भी एक्सेस नहीं करने देगा. हो गया! हमने आपके लिए ई-मेल नोटिफिकेशन को ऑफ कर दिया है! - टाइम आउट !!{user}!! सिंक को ऑफ करें सिंक को ऑफ करने से सलेक्ट किया गया एक्स्पायर हो चुके सब-बिहेवियर पर ऐसे परफॉर्म करेगा जैसे कि सभी सब्सक्राइबर एक्स्पायर हो चुके हैं. सिंक को ऑफ करने से सलेक्ट किया गया एक्स्पायर हो चुके मेम्बरशिप बिहेवियर पर ऐसे परफॉर्म करेगा जैसे कि सभी मेम्बर एक्स्पायर हो चुके हैं. @@ -2410,7 +2409,6 @@ स्पैम को कम करने के लिए, मैसेज भेजने से पहले सर्वर के मेम्बर के पास एक वेरीफाई किया ईमेल होना चाहिए. यह बात रोल वाले मेम्बर पर नहीं लागू होती है. वेरीफाई किए गए ईमेल की ज़रूरत है आपका सर्वर वेरिफिकेशन लेवल की शर्तों को पहले ही पूरा करता है. - !!{user}!! से टाइम आउट को रिमूव करें इन-गेम ओवरले को ऑन करें. नॉइज़ सप्रेस करना ऑन करें नोटिफ़िकेशन को इनेबल करें @@ -3425,9 +3423,7 @@ सर्वर प्रोफ़ाइल बैनर सर्वर प्रोफ़ाइल - $[](guildIconHook) !!{guildName}!! [Discord Nitro!](onAndMore) के साथ अपने हर सर्वर में अलग-अलग अवतार, प्रोफ़ाइल बैनर और मेरे बारे में के साथ और भी बहुत कुछ का इस्तेमाल करें. - Nitro के साथ अपनी प्रोफ़ाइल के सभी कस्टमाइज़ेशन को अनलॉक करके इस सर्वर में खुद को और ज़्यादा एक्सप्रेस करें. वो बनें जो आप बनना चाहते हैं और [Discord Nitro!](onAndMore) के साथ अपने हर सर्वर में अलग-अलग अवतार, बैनर और बायो का इस्तेमाल करें, एनिमेटेड अवतार अनलॉक करें और भी बहुत कुछ करें. - सर्वर प्रोफ़ाइल का पूरा ऐक्सेस चाहते हैं? सर्वर पर इनवाइट करें इनवाइट्स {xDays} में एक्सपायर हो जाएंगे. दूसरे सर्वर @@ -6969,7 +6965,6 @@ Discord Nitro सदस्यता के साथ अपना खुद का बैनर और बहुत सी चीज़े अपलोड करें! $[](renderTimeHook) बीत चुका है प्रोफ़ाइल कस्टमाइज़ेशन फिलहाल कुछ लोगों के लिए ही उपलब्ध है. - दुनिया को अपने बारे में कुछ बताएं अगर आपके पास Nitro सब्सक्रिप्शन, प्रोफाइल बैनर है, तो मेरे बारे में के साथ खुद को एक्सप्रेस करें! समझ गए मेरी प्रोफ़ाइल अपडेट करें @@ -9237,7 +9232,6 @@ अपनी नई सेटिंग को इफ़ेक्ट करने के लिए ऐप को रिस्टार्ट करें. सेव करें QR कोड को स्कैन करें - किसी खास सर्वर के लिए अपनी प्रोफ़ाइल बदलने की कोशिश कर रहे हैं? अपनी सर्वर प्रोफ़ाइल को एडिट करने के लिए सर्वर पर जाएं. गेम लाइब्रेरी दिखाएं गेम लाइब्रेरी को हाईड के लिए इसे ऑफ़ करें ताकि आप अपनी बातचीत पर फोकस कर सकें. Discord बैकग्राउंड में स्टार्ट होता है और आपके काम के बीच में नहीं आता है. diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 13c535d04c..9fa6aadc9a 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -2159,7 +2159,6 @@ Onemogući račun Jesi li siguran da želiš onemogućiti svoj račun? Ovo će te odmah odjaviti i učiniti vaš račun nedostupnim svima. Uspjeh! Ugasili smo ti e-mail obavijesti! - Time Out !!{user}!! Onemogući sinkronizaciju Onemogućivanje sinkronizacije će dovesti do isteka članstva svih pretplatnika. Onemogućivanje sinkronizacije će imati učinak da će se istekla članstva ponašati kao da su svi članovi istekli. @@ -2410,7 +2409,6 @@ Kako bismo svi skupa smanjili količinu spama, prije nego im se dopusti slanje poruka, članovi servera moraju imati potvrđene adrese e-pošte. To ne vrijedi za članove koji imaju neke uloge. Potrebna je potvrđena adresa e-pošte Tvoj server već zadovoljava ili i premašuje potrebnu razinu verifikacije. - Ukloni Time Out od korisnika !!{user}!! Omogući overlay unutar igre. Omogući potiskivanje šuma Omogući obavijesti @@ -3425,9 +3423,7 @@ Banner profila servera Profil servera - $[](guildIconHook) !!{guildName}!! Postavi drugačiji avatar, banner profila i bio u svakom od svojih servera i još mnogo toga uz [Discord Nitro!](onAndMore) - Izrazi se još više na ovom serveru otključavanjem svih prilagodbi profila uz Nitro. Budi tko god želiš i koristi drugi avatar, banner i bio u svakom od svojih servera, otvori si animirane avatare i još mnogo toga uz [Discord Nitro!](onAndMore) - Želiš li puni pristup profilima servera? Pozovi na servere Pozivnice istječu za {xDays}. Drugi serveri @@ -6969,7 +6965,6 @@ Ako imaš Discord Nitro, možeš nam dati da ti stavimo tvoj vlastiti banner koji je tvojih ruku djelo. $[](renderTimeHook) proteklo Prilagođavanje profila trenutno je dostupno samo ograničenom broju korisnika. - Reci svijetu nešto o sebi Izrazi se uz dio O meni, a - ako imaš Nitro - dobiješ i banner svojega profila! Kužim Ažuriraj mi profil @@ -9237,7 +9232,6 @@ Ponovno pokreni aplikaciju da bi se nove postavke aktivirale. Spremi Skeniraj QR kôd - Pokušavaš promijeniti svoj profil za određeni server? Idi na server i uredi svoj profil servera. Pokaži zbirku igara Isključi ovo da bi sakrio svoju zbirku igara i tako svoje razgovore stavio u centar pažnje. Discord se pokreće u pozadini i ostaje izvan tvog vidokruga. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6251cc75bc..801460607b 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2159,7 +2159,6 @@ Fiók deaktiválása Biztos vagy benne, hogy deaktiválni szeretnéd a fiókod? Emiatt rögtön ki leszel jelentkeztetve a fiókodból, és mindenki számára elérhetetlen lesz. Siker! Letiltottuk az e-mail értesítéseket számodra! - !!{user}!! felfüggesztése Szinkronizálás kikapcsolása A szinkronizálás kikapcsolása az összes előfizetést elavultnak fogja tekinteni, mint a kiválasztott lejárt előfizetést. A szinkronizálás letiltása azt a kiválasztott lejárt tagsági viselkedést fogja végrehajtani, mintha minden tag lejárt volna. @@ -2410,7 +2409,6 @@ A spamek számának minimalizálása érdekében a szerver tagjainak ellenőrzött e-mail-címmel kell rendelkeznie ahhoz, hogy üzeneteket tudjanak küldeni. Ez a ranggal rendelkező tagokra nem vonatkozik. Ellenőrzött e-mail-cím szükséges A szervered már eléri vagy meghaladja a megkövetelt ellenőrzési szintet. - Felfüggesztés feloldása: !!{user}!! Átfedés engedélyezése. Zajcsökkentés engedélyezése Értesítések engedélyezése @@ -3424,9 +3422,7 @@ Szerverprofilbanner Szerverprofil – $[](guildIconHook) !!{guildName}!! Használj eltérő profilképet, profilbannert és bemutatkozást minden szervereden, és juss hozzá még sok minden máshoz [Discord Nitro-előfizetéssel!](onAndMore) - Fejezd ki magadat még jobban ezen a szerveren a profil személyre szabások feloldásával a Nitro-előfizetés révén! Legyél, aki csak szeretnél és használj eltérő profilképet, bannert és bemutatkozást minden egyes szervereden, oldd fel az animált profilképeket, és juss hozzá még sok minden máshoz is a [Discord Nitro-előfizetéssel!](onAndMore) - Szeretnél teljes hozzáférést a szerverprofilokhoz? Meghívás szerverekre A meghívó {xDays} nap múlva lejár. Egyéb szerverek @@ -6968,7 +6964,6 @@ Töltsd fel a személyre szabott banneredet és sok mást a Discord Nitro-előfizetéssel! $[](renderTimeHook) telt el A profil testreszabása jelenleg korlátozott számú felhasználó számára érhető el. - Mesélj a világnak egy kicsit magadról Mondj el többet magadról a Bemutatkozás részben, és ha van Nitro-előfizetésed, egy profilbannerrel! Megértettem Profilom frissítése @@ -9236,7 +9231,6 @@ Indítsd újra az alkalmazást az új beállítások érvénybe lépéséhez. Mentés QR-kód beolvasása - Megváltoztatnád a profilodat egy adott szerverhez? Lépj a szerverre a szerverprofilod szerkesztéséhez! Játékkönyvtár megjelenítése Kapcsold ki ezt a játékkönyvtárad elrejtéséhez, így a beszélgetésekre koncentrálhatsz. A Discord a háttérben indul el, és nem lesz útban. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 39c396ccdd..89f81a115a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2164,7 +2164,6 @@ Disattiva account Sei sicuro di voler disattivare il tuo account? Verrai immediatamente disconnesso e renderai il tuo account inaccessibile a tutti. Ben fatto, hai disattivato le notifiche via e-mail! - Metti !!{user}!! in Time out Disattiva la sincronizzazione Disattivando la sincronizzazione, verrà eseguita l\'azione per gli abbonamenti scaduti selezionata come se tutti gli abbonamenti fossero scaduti. Disattivando la sincronizzazione, verrà eseguita l\'azione per le iscrizioni scadute selezionata come se tutti i membri avessero l\'iscrizione scaduta. @@ -2415,7 +2414,6 @@ Per minimizzare la quantità di spam, i membri del server devono avere un\'e-mail verificata prima di poter inviare messaggi. Questo non si applica agli utenti con dei ruoli. È necessaria un\'e-mail verificata Il tuo server soddisfa già o supera il requisito di livello di verifica. - Rimuovi !!{user}!! dal Time out Attiva l\'overlay in gioco. Attiva la riduzione del rumore Abilita notifiche @@ -3430,9 +3428,7 @@ Banner del profilo del server Profilo del server - $[](guildIconHook) !!{guildName}!! Imposta un avatar, un banner del profilo e un Chi sono diversi in ognuno dei tuoi server e molto altro ancora con [Discord Nitro!](onAndMore) - Esprimiti ancora di più in questo server sbloccando tutte le personalizzazioni del profilo con Nitro. Puoi essere chi vuoi e utilizzare avatar, banner e informazioni diversi in ognuno dei tuoi server, sbloccare avatar animati e molto altro ancora con [Discord Nitro!](onAndMore) - Vuoi l\'accesso completo ai profili dei server? Invita nei server Gli inviti scadono tra {xDays}. Altri server @@ -3691,7 +3687,7 @@ Imposta il comportamento per gli abbonamenti scaduti a **Espelli** Imposta il comportamento per gli abbonamenti scaduti a **Rimuovi ruolo** Imposta il periodo di tolleranza dopo la scadenza su **{newValue}** - $[**!!{user}!!**](userHook) ha aggiornato l\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 + $[**!!{user}!!**](userHook) ha aggiornato l\'integrazione per $[**!!{target}!!**](targetHook) Per il canale **!!{newValue}!!** Con il codice **!!{newValue}!!** $[**!!{user}!!**](userHook) ha creato un invito $[**!!{target}!!**](targetHook) @@ -6974,7 +6970,6 @@ Carica il tuo banner personalizzato e molto altro ancora con Discord Nitro! $[](renderTimeHook) trascorsi La personalizzazione del profilo è al momento disponibile per un numero limitato di persone. - Racconta al mondo chi sei Esprimiti nella sezione Chi sono e, se hai Nitro, con un banner del profilo! Capito Aggiorna il mio profilo @@ -9245,7 +9240,6 @@ Riavvia l\'app per caricare le tue nuove impostazioni. Salva Scansiona codice QR - Vuoi modificare il tuo profilo per un server specifico? Vai sul server per modificare il tuo profilo del server. Mostra Libreria giochi Disattiva questa opzione per nascondere la Libreria giochi, così potrai concentrarti sulle tue conversazioni. Discord si avvierà in background e rimarrà nascosto. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9528e32360..253df118c5 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2169,7 +2169,6 @@ アカウントを無効にする 本当にアカウントを削除してもよろしいですか？削除すると直ちにログアウトされ、誰もアカウントにアクセスすることができなくなります。 成功！メール通知を無効にしました。 - !!{user}!! をタイムアウトさせる 同期を無効 同期を無効にすると、ある購読の有効期限が切れると、すべての購読の有効期限が切れているように見えます。 同期を無効にすると、ある会員の有効期限が切れると、すべての会員の有効期限が切れているように見えます。 @@ -2420,7 +2419,6 @@ スパムを防ぐため、サーバーのメンバーがメッセージを送るには認証済みのメールアドレスが必要になります。ただしロールのあるメンバーは例外となります。 認証済みメールアドレスが必要です あなたのサーバーは認証レベル要件を十分に満たしています。 - !!{user}!! のタイムアウトを解除する ゲーム中のオーバーレイを有効化 ノイズ抑制の有効化 通知の有効化 @@ -3435,9 +3433,7 @@ サーバープロフィールバナー サーバープロフィール - $[](guildIconHook) !!{guildName}!! サーバーごとに使うアバター、プロフィールバナー、自己紹介を変えることも、[Discord Nitro](onAndMore) ならできちゃいます！ - Nitro で使えるプロフィール・カスタマイズ機能を全てアンロックして、このサーバーで自分をもっともっと表現しちゃいましょう。 なりたい自分になるため、サーバーごとにアバターやバナー、自己紹介を変えたり、アニメアバターをアンロックしたり。その他いろんなことが [Discord Nitro](onAndMore) ならできちゃいます！ - サーバープロフィールの全機能をフルに使いたい？ サーバーに招待 招待の有効期限は残り {xDays} 日です。 他のサーバー @@ -6979,7 +6975,6 @@ Discord Nitro なら、自分だけのバナーをアップロードしたりできますよ！ $[](renderTimeHook)経過 プロフィールのカスタマイズは現在、一部のユーザー限定の機能となっています。 - 世界があなたを知りたがっています 「自己紹介」で自己表現。Nitro に登録していればプロフィールバナーも使えます！ 了解 プロフィールを更新 @@ -9248,7 +9243,6 @@ アプリを再起動して新しい設定を有効にします。 保存 QRコードのスキャン - 特定のサーバー用にプロフィールを変えたい？ そのサーバーに移動して、サーバープロフィールを編集しましょう。 ゲームライブラリの表示 オフにすると、会話に集中できるようゲームライブラリを非表示にします。 Discordがバックグラウンドで起動し、あなたの作業を妨げないようにしてくれます。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index d96afe8c0c..b1d391085b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2164,7 +2164,6 @@ 계정 비활성화 정말로 계정을 비활성화하시겠어요? 즉시 계정에서 로그아웃 되며 그 누구도 사용할 수 없어요. 성공! 이메일 알림을 비활성화했어요! - !!{user}!! 님 타임아웃 동기화 해제하기 동기화를 해제하면 모든 구독자의 구독이 만료된 것처럼 처리돼요. 동기화를 해제하면 모든 멤버의 멤버십이 만료된 것처럼 처리돼요. @@ -2415,7 +2414,6 @@ 스팸을 최소화하려면, 서버의 멤버들이 메시지 전송 권한을 얻기 전에 이메일 인증부터 해야 해요. 역할이 부여된 멤버들에게는 해당하지 않아요. 이메일을 인증해야 해요 이 서버에 요구되는 보안 수준을 이미 만족했어요. - !!{user}!! 님 타임아웃 해제 게임 내에서 오버레이 활성화하기. 잡음 제거 켜기 알림 활성화 @@ -3430,9 +3428,7 @@ 서버 프로필 배너 서버 프로필 - $[](guildIconHook) !!{guildName}!! [Discord Nitro 구독](onAndMore)으로 참가 중인 서버마다 각기 다른 아바타와 프로필 배너, 소개글을 설정하세요! - Nitro를 구독하면 모든 프로필 맞춤 설정 옵션을 잠금 해제되어 서버에서 더 마음껏 자신을 표현할 수 있어요. 참가 중인 서버마다 다른 아바타, 배너, 소개글을 사용하고, 움직이는 아바타를 잠금 해제하는 등, [Discord Nitro](onAndMore) 구독으로 다양한 특전을 누리세요! - 서버 프로필 기능을 모두 이용하고 싶으신가요? 서버 초대 초대 만료까지 {xDays}. 기타 서버 @@ -6974,7 +6970,6 @@ Discord Nitro로 개인 배너를 업로드하는 등 다양한 기능을 이용할 수 있어요! 경과 시간: $[](renderTimeHook) 프로필 맞춤 설정은 현재 일부 사용자들만 사용할 수 있습니다. - 자신을 소개하세요 내 소개를 통해 나를 표현해 보세요. Nitro가 있다면 프로필 배너도 사용할 수 있답니다! 알겠어요 프로필 업데이트하기 @@ -8504,7 +8499,7 @@ 스웨덴어 로그인 바꾸기 - 계정 활성화 + 활성 계정 계정 추가하기 계정 선택하기 로그인할 계정을 선택하거나 새 계정을 추가하세요. @@ -8515,7 +8510,7 @@ 계정을 전환하고, 로그인하고, 로그아웃하고, 마음껏 즐겨 보세요. 로그아웃 죄송해요, 바뀌지 않았어요 ㅠㅠ - {username}(으)로 바꾸기 + {username}(으)로 변경됨 오디오 출력 변경 하드웨어 가속 변경 하드웨어 가속 설정을 변경하려면 Discord를 재시작해야 해요. 그래도 이 작업을 계속하시겠어요? @@ -9245,7 +9240,6 @@ 새로운 설정을 적용하려면 앱을 재시작하세요. 저장 QR 코드 스캔 - 특정 서버에서의 내 프로필을 바꾸고 싶다고요? 그렇다면 해당 서버로 가서 내 서버 프로필을 편집하세요. 게임 라이브러리 표시하기 이 설정을 끄면 게임 라이브러리를 숨기고 대화에 집중할 수 있어요. Discord를 백그라운드에서 시작해요. diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 8937db0cb9..b95ef1c80f 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -2159,7 +2159,6 @@ Išjungti Paskyrą Ar tu įsitikinęs, kad nori išjungti savo paskyrą? Tai iš karto tave atjunks ir padarys tavo paskyrą nebepasiekiamą niekam. Pavyko! Mes išjungėme el. pašto pranešimus! - Laikinai nutildyti !!{user}!! Išjungti sinchronizavimą Išjungiant sinchronizaciją pasikeis pasirinkta pasibaigusi prenumerata tarsi visos būtų pasibaigusios. Išjungiant sinchronizaciją pasikeis pasirinkta pasibaigusi narystė tarsi visos būtų pasibaigusios. @@ -2410,7 +2409,6 @@ Siekiant sumažinti brukalo kiekį, serverio nariai privalo patvirtinti savo el. pašto adresus, kad galėtų siųsti žinutes. Tai netaikoma vaidmenį turintiems nariams. Reikalingas patvirtintas el. pašto adresas Tavo serveris jau atitinka arba viršija patvirtinimo lygio reikalavimą. - Panaikinti !!{user}!! laikiną nutildymą Įjungti perdangą žaidimuose. Įjungti triukšmo slopinimą Įjungti pranešimus @@ -3425,9 +3423,7 @@ Serverio profilio reklamjuostė Serverio profilis – $[](guildIconHook) !!{guildName}!! Pasirink skirtingus pseudoportretus, profilio reklamjuostes ir aprašus kiekviename savo serveryje ir dar daugiau su [Discord Nitro!](onAndMore) - Dar geriau išreikšk save šiame serveryje, gaudamas (-a) profilio tinkinimą su Nitro. Būk, kuo nori būti, ir naudok skirtingus pseudoportretus, reklamjuostes ir aprašus kiekviename savo serveryje – gauk animuotus pseudoportretus ir dar daugiau su [Discord Nitro!](onAndMore) - Nori besąlygiškos prieigos prie serverio profilių? Pakviesk prisijungti prie serverių Kvietimai baigs galioti po {xDays}. Kiti serveriai @@ -6969,7 +6965,6 @@ Įkelk savo suasmenintą reklamjuostę ir dar daugiau, naudodamas Discord Nitro! $[](renderTimeHook) praėjo Šiuo metu profilio pritaikymo funkcijos pasiekiamos ribotam žmonių skaičiui. - Papasakok pasauliui šiek tiek apie save Išreikšk save papasakodamas (-a) apie save ir, jei turi Nitro, naudodamas (-a) profilio reklamjuostę! Supratau Atnaujinti mano profilį @@ -9237,7 +9232,6 @@ Paleisk programėlę iš naujo, kad įsigaliotų naujosios nuostatos. Išsaugoti Nuskaityti QR kodą - Bandai pakeisti savo profilį konkrečiam serveriui? Eik į serverį ir redaguok savo serverio profilį. Rodyti Žaidimų biblioteką Išjunk, kad paslėptum Žaidimų biblioteką ir galėtum skirti dėmesį pokalbiams. Discord įsijungia fone ir netrukdo. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9cc9867e4d..3babfd4b38 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2164,7 +2164,6 @@ Account uitschakelen Weet je zeker dat je je account wilt uitschakelen? Hierdoor word je meteen afgemeld en wordt je account voor iedereen ontoegankelijk. Gelukt! We hebben e-mailmeldingen voor je uitgeschakeld! - Time-out !!{user}!! Synchronisatie uitschakelen Als je synchronisatie uitschakelt, voert het geselecteerde verlopen subgedrag uit alsof alle subs zijn verlopen. Als je synchronisatie uitschakelt, wordt het geselecteerde protocol voor verlopen lidmaatschap geactiveerd alsof het lidmaatschap van alle leden is verlopen. @@ -2415,7 +2414,6 @@ Om spam zo veel mogelijk te voorkomen, moeten leden van de server hun e-mailadres verifiëren voordat ze berichten kunnen sturen. Dit geldt niet voor leden met rollen. Geverifieerd e-mailadres verplicht Je server voldoet al aan of overschrijdt het minimale verificatieniveau. - Verwijder time-out bij !!{user}!! In-game overlay inschakelen. Ruisonderdrukking inschakelen Meldingen inschakelen @@ -3429,9 +3427,7 @@ Serverprofielbanner Serverprofiel - $[](guildIconHook) !!{guildName}!! Gebruik een andere avatar, profielbanner en \'over mij\' op al je servers en nog veel meer met [Discord Nitro!](onAndMore) - Toon je creativiteit nog meer op deze server door alle profielaanpassingen te ontgrendelen met Nitro. Wees wie je wilt zijn met een andere avatar, banner en bio op al je servers, ontgrendel geanimeerde avatars en nog veel meer met [Discord Nitro!](onAndMore) - Wil je volledige toegang tot serverprofielen? Uitnodigen op servers Uitnodiging vervalt over {xDays}. Andere servers @@ -6973,7 +6969,6 @@ Upload je eigen aangepaste banner en meer met Nitro! $[](renderTimeHook) voorbij Profielaanpassing is op dit moment beschikbaar voor een beperkt aantal mensen. - Stel jezelf voor aan de wereld Toon je creativiteit door wat over jezelf te vertellen en, als je Nitro hebt, met een profielbanner! Begrepen Update mijn profiel @@ -9243,7 +9238,6 @@ Start de app opnieuw om je nieuwe instellingen van kracht te laten worden. Opslaan QR-code scannen - Wil je je profiel voor een specifieke server aanpassen? Ga naar de server om je serverprofiel te bewerken. Toon Game-bibliotheek Schakel dit uit om je Game-bibliotheek te verbergen, zodat je je kunt concentreren op je gesprekken. Discord start op de achtergrond en zit je verder niet in de weg. diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index e550d1ee05..66dbf7dccb 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -2109,7 +2109,6 @@ Deaktiver kontoen Er du sikker på at du vil deaktivere kontoen din? Dette logger deg av umiddelbart, og gjør kontoen din utilgjengelig for alle. Vellykket! Vi har deaktivert e-postvarsler for deg! - Gi !!{user}!! timeout Slå av synkronisering Hvis du slår av synkronisering, utløses den valgte handlingen for utløpt abonnement, som om alle abonnenter har utløpt. Hvis du slår av synkronisering, utløses den valgte handlingen for utløpt medlemskap, som om alle medlemmer har utløpt. @@ -2360,7 +2359,6 @@ For å unngå så mye spam som mulig må medlemmer av serveren ha en bekreftet e-postadresse før de kan sende meldinger. Dette gjelder ikke for medlemmer med roller. Du må ha en bekreftet e-postadresse Serveren oppfyller eller overstiger allerede kravet for bekreftelsesnivå. - Avslutt timeout for !!{user}!! Aktiver overlegg i spillet. Slå på støydemping Aktiver varsler @@ -3315,9 +3313,7 @@ Serverprofilbanner Serverprofil – $[](guildIconHook) !!{guildName}!! Angi forskjellig avatar, profil og «om meg» på hver av serverne dine og mer med [Discord Nitro!](onAndMore) - Ved å låse opp alt av profiltilpasning med Nitro kan du uttrykke deg enda sterkere på denne serveren. Vær den du vil med egen avatar, banner og bio på hver server med [Discord Nitro!](onAndMore) Du kan også lås opp animerte avatarer og mer. - Vil du ha full tilgang til serverprofiler? Inviter til servere Invitasjonen utløper om {xDays}. Andre servere @@ -6809,7 +6805,6 @@ Last opp din personlige fane og mer med Discord Nitro! $[](renderTimeHook) brukt Profiltilpasning er for øyeblikket tilgjengelig for et begrenset antall personer. - Fortell verden litt om deg selv Uttrykk deg med et «om meg» og, hvis du har Nitro, et profilbanner! Forstått Oppdater profilen din @@ -9074,7 +9069,6 @@ Start appen på nytt for at de nye innstillingene skal tre i kraft. Lagre Skann QR-kode - Prøver du å forandre profil på en bestemt server? Gå til serveren for å redigere serverprofilen din. Vis spillbibliotek Slå av denne for å skjule spillbiblioteket ditt slik at du kan fokusere på samtalene dine. Discord starter i bakgrunnen og passer på å ikke forstyrre. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b5aa7371ca..af7e7584c1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2169,7 +2169,6 @@ Wyłącz konto Czy na pewno chcesz wyłączyć swoje konto? Zostaniesz natychmiast wylogowany(-a) ze swojego konta i nie będziesz w stanie zalogować się ponownie. Sukces! Wyłączyliśmy powiadomienia pocztą e-mail! - Zastosuj przerwę wobec użytkownika !!{user}!! Wyłącz synchronizację Wyłączenie synchronizacji wykona akcję wygaśnięcia subskrypcji dla wszystkich subskrybentów. Wyłączenie synchronizacji wykona akcję wygaśnięcia członkostwa dla wszystkich członków. @@ -2420,7 +2419,6 @@ By ograniczyć do minimum spamowanie, członkowie serwera muszą mieć zweryfikowany adres e-mail, zanim będą mogli wysyłać wiadomości. Nie ma to zastosowania do członków z rolami. Wymagany zweryfikowany adres e-mail Twój serwer już spełnia lub przekracza wymagany poziom weryfikacji. - Usuń trwającą przerwę dla użytkownika !!{user}!! Włącz nakładkę w grze. Włącz tłumienie zakłóceń Włącz powiadomienia @@ -3434,9 +3432,7 @@ Baner profilu serwerowego Profil serwerowy – $[](guildIconHook) !!{guildName}!! Ustaw inny awatar i baner profilu oraz spersonalizuj sekcję „O mnie” i nie tylko na każdym ze swoich serwerów dzięki [Discord Nitro!](onAndMore) - Wyraź siebie jeszcze mocniej na tym serwerze, odblokowując wszystkie możliwości personalizacji profilu dzięki Nitro. Bądź tym, kim chcesz, używaj innego awatara, banera i danych na każdym ze swoich serwerów oraz odblokuj animowane awatary (i nie tylko) dzięki [Discord Nitro!](onAndMore) - Chcesz pełnego dostępu do profilów serwerowych? Zaproś na serwery Zaproszenia wygasają za {xDays}. Inne serwery @@ -6978,7 +6974,6 @@ Discord Nitro pozwala Ci przesłać spersonalizowany baner i nie tylko! Upłynęło $[](renderTimeHook) Personalizacja profilu jest obecnie dostępna tylko dla ograniczonej liczby osób. - Opowiedz innym o sobie Wyrażaj siebie za pomocą opisu „o mnie” i, jeśli masz Nitro, banera profilu! Zrozumiano Zaktualizuj mój profil @@ -9246,7 +9241,6 @@ Uruchom ponownie aplikację, aby zaczęły obowiązywać bieżące ustawienia. Zapisz Zeskanuj kod QR - Próbujesz zmienić swój profil pod kątem określonego serwera? Przejdź do serwera, aby edytować swój profil serwerowy. Pokaż Bibliotekę gier Wyłącz to, aby ukryć Bibliotekę gier i móc skupić się na rozmowach. Discord otwiera się w tle i nie wchodzi Ci w drogę. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 0e25d65e5e..52f382740b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -2164,7 +2164,6 @@ Desativar conta Deseja mesmo desativar sua conta? Isso te desconectará dela imediatamente, e você não poderá mais entrar. Beleza! Desativamos as notificações no seu e-mail! - Colocar !!{user}!! de castigo Desativar sincronização Ao desativar a sincronização, o comportamento para inscritos expirados será executado como se todos os inscritos estivessem expirados. Ao desativar a sincronização, o comportamento para membros expirados será executado como se todos os membros estivessem expirados. @@ -2415,7 +2414,6 @@ Para reduzirmos a quantidade de spams, os membros do servidor precisam ter um e-mail verificado antes de poderem mandar mensagens. Isto não se aplica a membros com cargos. Requer e-mail verificado Seu servidor já cumpre ou excede os requisitos do nível de verificação. - Remover castigo de !!{user}!! Ativar sobreposição em jogo. Ativar a supressão de ruído Permitir notificações @@ -3378,9 +3376,7 @@ Faixa do perfil do servidor Perfil do servidor - $[](guildIconHook) !!{guildName}!! Defina avatares, faixas de perfil e a área sobre mim em cada um dos seus servidores e muito mais com o [Discord Nitro!](onAndMore) - Expresse-se ainda mais neste servidor desbloqueando todas as personalizações de perfil com o Nitro. Seja quem você quiser e use avatares, faixas e bio diferentes em cada um dos seus servidores, desbloqueie avatares animados, e muito mais com o [Discord Nitro!](onAndMore) - Quer acesso total aos perfis de servidores? Convidar para o servidores Convites expiram em {xDays}. Outros servidores @@ -6921,7 +6917,6 @@ Faça upload do seu banner personalizado e muito mais com Discord Nitro! $[](renderTimeHook) decorridos No momento, a personalização de perfil está disponível apenas para algumas pessoas. - Conte ao mundo um pouco sobre você Expresse-se com uma sessão sobre mim e, se tiver o Nitro, uma faixa de perfil! Entendi Atualizar meu perfil @@ -9188,7 +9183,6 @@ Reinicie o aplicativo para aplicar suas novas configurações. Salvar Escanear o código QR - Tentando mudar seu perfil para um servidores específico? Vá para o servidor para editar seu perfil. Mostrar Biblioteca de Jogos Desative isso para ocultar a Biblioteca de Jogos, assim você pode se concentrar em suas conversas. O Discord abre em segundo plano sem te incomodar. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 67be5f71e8..cbc0f24736 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2159,7 +2159,6 @@ Dezactivează contul Ești sigur că vrei să-ți dezactivezi contul? Această acțiune te va deconecta imediat și îți va face contul complet inaccesibil. Succes! Am dezactivat notificările prin e-mail pentru tine! - Pune pe pauză pe !!{user}!! Dezactivează sincronizarea Dezactivarea sincronizării va executa comportamentul abonatului expirat care a fost selectat ca și cum toți abonații ar fi expirat. Dezactivarea sincronizării va executa comportamentul membrului expirat care a fost selectat ca și cum toți membrii ar fi expirat. @@ -2410,7 +2409,6 @@ Pentru a reduce numărul de mesaje spam, membrii server-ului trebuie să aibă o adresă de e-mail verificată înainte de a putea trimite mesaje. Regula nu afectează membrii cu roluri. E necesară o adresă de e-mail verificată Server-ul tău îndeplinește sau depășește deja cerința nivelului de verificare. - Scoate din pauză pe !!{user}!! Activează overlay-ul în cadrul jocului. Activează suprimarea zgomotului Activează notificările @@ -3425,9 +3423,7 @@ Banner de profil pentru server Profil server - $[](guildIconHook) !!{guildName}!! Folosește câte un avatar, banner pentru profil și secțiune Despre mine diferite pe fiecare server, plus multe altele cu [Discord Nitro!](onAndMore) - Exprimă-te și mai mult pe acest server deblocând toate opțiunile de personalizare a profilului cu Nitro. Fii cine vrei să fii și folosește câte un avatar, banner și profil diferit pe fiecare server, deblochează avatarurile animate, plus multe altele cu [Discord Nitro!](onAndMore) - Vrei acces deplin la profilurile pentru server? Invită pe servere Invitația expiră în {xDays}. Alte servere @@ -6969,7 +6965,6 @@ Încarcă-ți propriul banner personalizat și multe altele cu Discord Nitro! Timp scurs: $[](renderTimeHook) Personalizarea profilului este momentan disponibilă doar unui număr limitat de utilizatori. - Povestește oamenilor câte ceva despre tine Exprimă-te cu o secțiune „Despre mine” și, dacă ai Nitro, cu un banner pentru profil! Am înțeles Actualizează profilul @@ -9237,7 +9232,6 @@ Repornește aplicația pentru ca setările tale să fie puse în aplicare. Salvează Scanează cod QR - Încerci să-ți schimbi profilul pe un anumit server? Intră pe serverul respectiv pentru a-ți edita profilul de pe server. Arată Biblioteca de jocuri Dezactivează pentru a ascunde Biblioteca de jocuri, ca să te poți concentra pe conversații. Discord pornește în fundal și nu-ți stă în cale. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 01b489c844..db765ed139 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2169,7 +2169,6 @@ Отключить учётную запись Вы уверены, что хотите отключить свою учётную запись? Это приведёт к мгновенному выходу из учётной записи и её недоступности для всех. Успех! Мы отключили для вас уведомления по электронной почте! - Отправить !!{user}!! подумать о своём поведении Отключить синхронизацию После отключения синхронизации ко всем, у кого закончилась подписка, будет применена выбранная мера. После отключения синхронизации ко всем, у кого закончилось членство, будет применена выбранная мера. @@ -2420,7 +2419,6 @@ Чтобы уменьшить количество спама, участники сервера должны подтвердить свой адрес электронной почты, перед тем как отправлять сообщения. Данное требование не распространяется на членов с ролями. Требуется подтверждённый адрес электронной почты Ваш сервер уже удовлетворяет требованиям уровня проверки или даже превосходит их. - Вернуть голос !!{user}!! Включить внутриигровой оверлей. Включить шумоподавление Включить уведомления @@ -3435,9 +3433,7 @@ Баннер профиля на сервере Профиль на сервере: $[](guildIconHook) !!{guildName}!! Подписка [Discord Nitro](onAndMore) позволяет вам использовать разные аватары, баннеры профиля и биографию на каждом из своих серверов! - Подписка Nitro — это ещё больше возможностей персонализации профиля! Используйте разные аватары (в том числе анимированные), баннеры и биографии на каждом из своих серверов — всё это и многое другое вы получите с подпиской [Discord Nitro!](onAndMore) - Хотите полный доступ к возможностям профилей на серверах? Пригласить на серверы Срок действия приглашения закончится через {xDays}. Другие серверы @@ -6979,7 +6975,6 @@ Загрузите собственный баннер и откройте другие возможности с подпиской Discord Nitro! Прошло $[](renderTimeHook) На текущий момент персонализация профиля доступна ограниченному кругу пользователей. - Расскажите миру о себе Придайте вашему профилю уникальности, заполнив раздел персональных данных и, если у вас есть подписка Nitrо, установив баннер профиля! Ясно Обновить мой профиль @@ -9247,7 +9242,6 @@ Перезапустите приложение, чтобы новые параметры вступили в силу. Сохранить Сканировать QR-код - Пытаетесь изменить свой профиль на конкретном сервере? Зайдите в настройки сервера, чтобы настроить свой профиль. Показывать библиотеку игр Отключите этот параметр, если хотите скрыть библиотеку игр и сосредоточиться на общении. Discord запускается в фоновом режиме и не отвлекает вас. diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 099be1f9af..691ce35fa2 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -2114,7 +2114,6 @@ Inaktivera konto Är du säker på att du vill inaktivera ditt konto? Detta kommer genast att logga ut dig och göra ditt konto otillgängligt för alla. Klart! Vi har inaktiverat e-postaviseringar åt dig! - Ge !!{user}!! timeout Inaktivera synkning Inaktivering av synkning utför det valda alternativet för behandling av utgången prenumeration som om alla prenumerationer var utgångna. Inaktiveras synkningen kommer det valda alternativet för behandling av utgångna medlemskap att utföras och behandla alla medlemskap som om de var utgångna. @@ -2365,7 +2364,6 @@ För att minimera skräppost måste servermedlemmarna ha en verifierad e-postadress för att kunna skicka meddelanden. Detta gäller inte medlemmar med roller. Verifierad e-postadress krävs Din server uppfyller redan eller överträffar verifieringsnivåkraven. - Upphäv timeouten på !!{user}!! Aktivera overlay i spel. Aktivera brusreducering Aktivera aviseringar @@ -3320,9 +3318,7 @@ Serverprofilbanner Serverprofil: $[](guildIconHook) !!{guildName}!! Använd en särskild avatar, profilbanner och personlig information på var och en av dina servrar och annat med [Discord Nitro!](onAndMore) - Uttryck dig ännu mer på denna server genom att låsa upp alla profilanpassningar med Nitro. Var den du vill vara och använd en särskild avatar, banner och bio på var och en av dina servrar, lås upp animerade avatarer och annat med [Discord Nitro!](onAndMore) - Vill du ha fullständig åtkomst till serverprofiler? Bjud in till servrar Inbjudningarna går ut om {xDays}. Andra servrar @@ -6813,7 +6809,6 @@ Ladda upp din personliga banner och annat med Discord Nitro! $[](renderTimeHook) har förflutit Profilanpassning finns för närvarande tillgängligt för ett begränsat antal personer. - Berätta lite om dig själv för världen Tala om vem du är med en om mig och, om du har Nitro, en profilbanner! Jag förstår Uppdatera min profil @@ -9078,7 +9073,6 @@ Starta om appen för att dina nya inställningar ska börja gälla. Spara Skanna QR-kod - Försöker du ändra i en serverspecifik profil? Gå till servern och redigera serverprofilen. Visa Spelbibliotek Stäng av för att dölja ditt Spelbibliotek så att du kan koncentrera dig på dina konversationer. Discord startar i bakgrunden och förblir utom synhåll. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 33d7557c41..cb5db866d5 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2159,7 +2159,6 @@ ระงับบัญชีผู้ใช้ คุณแน่ใจหรือไม่ว่าจะระงับบัญชีผู้ใช้ของคุณ การกระทำนี้จะนำคุณออกจากระบบทันที จะไม่มีใครสามารถเข้าใช้บัญชีผู้ใช้ของคุณได้อีก สำเร็จ เราระงับการแจ้งเตือนด้วยอีเมลให้คุณแล้ว - ทำให้ !!{user}!! หมดเวลา ปิดใช้การซิงค์ เมื่อปิดการ sync, ระบบจะทำงานตามพฤติกรรมที่เลือกไว้ เหมือนกับกรณีที่ Subscription ทั้งหมด หมดอายุลง การปิดซิงค์จะทำงานตามพฤติกรรมสมาชิกที่หมดอายุที่เลือกไว้ เหมือนกับกรณีที่สมาชิกทั้งหมดหมดอายุลง @@ -2410,7 +2409,6 @@ เพื่อลดการสแปม สมาชิกของเซิร์ฟเวอร์จะต้องยืนยันอีเมลก่อนจึงจะส่งข้อความได้ โดยกฎนี้ไม่มีผลบังคับต่อสมาชิกที่มีตำแหน่ง ต้องใช้อีเมลที่ผ่านการยืนยันแล้ว เซิร์ฟเวอร์ของคุณทำได้หรือทำได้ดีกว่าข้อกำหนดระดับการยืนยันตัวตนแล้ว - นำการหมดเวลาออกจาก !!{user}!! เปิดใช้ overlay ในขณะเล่นเกม เปิดใช้การลดเสียงรบกวน เปิดการแจ้งเตือน @@ -3425,9 +3423,7 @@ แบนเนอร์โปรไฟล์ของเซิร์ฟเวอร์ โปรไฟล์เซิร์ฟเวอร์ - $[](guildIconHook) !!{guildName}!! ใช้สัญลักษณ์ประจำตัว แบนเนอร์โปรไฟล์ และส่วนเกี่ยวกับฉันที่แตกต่างกันในแต่ละเซิร์ฟเวอร์ของคุณ และอีกมากมายด้วย [Discord Nitro!](onAndMore) - แสดงความเป็นตัวคุณให้มากกว่าเดิมในเซิร์ฟเวอร์นี้ด้วยการปลดล็อกการปรับแต่งโปรไฟล์ทั้งหมดด้วย Nitro เป็นตัวตนที่คุณต้องการและใช้สัญลักษณ์ประจำตัว แบนเนอร์ และประวัติที่แตกต่างกันในแต่ละเซิร์ฟเวอร์ของคุณ ปลดล็อกสัญลักษณ์ประจำตัวแบบเคลื่อนไหว และอีกมากมายด้วย [Discord Nitro!](onAndMore) - ต้องการเข้าถึงโปรไฟล์เซิร์ฟเวอร์อย่างเต็มรูปแบบใช่ไหม เชิญเข้าสู่เซิร์ฟเวอร์ คำเชิญจะหมดอายุใน {xDays} เซิร์ฟเวอร์อื่น @@ -6969,7 +6965,6 @@ อัปโหลดแบนเนอร์ที่ปรับแต่งตามสไตล์ของคุณเองและอีกมากมายด้วย Discord Nitro! $[](renderTimeHook) ผ่านไป ในตอนนี้ การปรับแต่งโปรไฟล์เปิดให้ใช้งานแล้ว แต่จำกัดจำนวนผู้ใช้ - บอกให้โลกรู้จักคุณเพิ่มอีกสักนิด แสดงความเป็นตัวคุณด้วยส่วนเกี่ยวกับฉัน และแบนเนอร์โปรไฟล์หากคุณมี Nitro! เข้าใจแล้ว อัปเดตโปรไฟล์ของฉัน @@ -9237,7 +9232,6 @@ เริ่มต้นแอปใหม่เพื่อให้การตั้งค่าใหม่มีผล บันทึก สแกนรหัส QR - อยากเปลี่ยนโปรไฟล์เฉพาะในบางเซิร์ฟเวอร์ใช่ไหม ไปยังเซิร์ฟเวอร์นั้นแล้วแก้ไขโปรไฟล์เซิร์ฟเวอร์ของคุณได้เลย แสดงไลบรารีเกม ปิดใช้งานส่วนนี้เพื่อซ่อนไลบรารีเกม คุณจะได้สนใจกับการสนทนาของคุณได้อย่างเต็มที่ Discord จะเริ่มทำงานในระบบเบื้องหลังและไม่วุ่นวายกับคุณ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 8687f9f435..831b149eb6 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2169,7 +2169,6 @@ Hesabı Devre Dışı Bırak Hesabını devre dışı bırakmak istediğinden emin misin? Bu işlem, oturumunu derhal kapatacak ve hesabına hiç kimse erişemeyecek. Başarılı! Senin için e-posta bildirimlerini devre dışı bıraktık! - !!{user}!! Kullanıcısını Zamanaşımına Sok Senkronizasyonu Devre Dışı Bırak Seçilen takipçi yetkilerinin senkronizasyonunu kaldırmak bütün takipçileri zaman aşımına uğratacak. Seçilen üyelik yetkilerinin senkronizasyonunu kaldırmak bütün üyeleri zaman aşımına uğratacak. @@ -2420,7 +2419,6 @@ Spam sayısını en aza indirmek için, mesaj göndermek isteyen sunucu üyelerinin doğrulanmış bir e-postaya sahip olmaları gerekir. Bu, rolleri olan üyeler için geçerli değildir. Doğrulanmış bir e-posta gerekli Sunucun doğrulama seviyesi şartını sağlamış veya aşmış durumda. - !!{user}!! Kullanıcısının Zamanaşımını Kaldır Oyun içi arayüzü etkinleştir. Gürültü Azaltmayı etkinleştir Bildirimleri etkinleştir @@ -3434,9 +3432,7 @@ Sunucu Profili Afişi Sunucu Profili - $[](guildIconHook) !!{guildName}!! [Discord Nitro](onAndMore) ile sunucularında farklı bir avatar, profil afişi ve hakkımda kısmı belirle ve daha fazla özelliğe eriş! - Nitro ile bütün profil özelleştirmelerini açarak bu sunucuda kendini daha da iyi ifade et. Nasıl istiyorsan öyle görün; sunucularında farklı avatarlar, afişler ve biyografiler kullan, hareketli avatarları aç ve [Discord Nitro](onAndMore) ile daha fazlasına eriş! - Sunucu profillerine tam erişim mi istiyorsun? Sunuculara Davet Et Davetler {xDays} gün içinde geçersiz olacak. Diğer sunucular @@ -6978,7 +6974,6 @@ Discord Nitro ile kendi kişiselleştirilmiş afişini ve daha fazlasını yükle! $[](renderTimeHook) geçti Profil Özelleştirmeleri şimdilik sınırlı sayıda kişi tarafından kullanılabilir. - Dünyaya kendin hakkında bir şeyler anlat. Hakkımda bölümüyle ve eğer Nitro sahibiysen bir profil afişiyle kendini ifade et! Anladım Profilimi güncelle @@ -9246,7 +9241,6 @@ Yeni ayarlarının devreye girmesi için uygulamayı yeniden başlat. Kaydet QR Kodunu tara - Belirli bir sunucu için profilini mi değiştirmeye çalışıyorsun? Sunucuya git ve sunucu profilini düzenle. Oyun Kitaplığını Göster Oyun Kitaplığı\'nı gizleyip konuşmalara odaklanabilmek için bunu kapat. Discord arka planda çalışır ve yoluna çıkmaz. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 1d7e83b4c7..7b1c10e8f0 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2159,7 +2159,6 @@ Відключити обліковий запис Ти впевнений, що бажаєш вимкнути свій акаунт? Після цього ти негайно вийдеш з акаунту та зробиш його недоступним для всіх. Успіх! Ми вимкнули сповіщення електронною поштою для тебе! - !!{user}!!: тимчасовий блок Вимкнути синхронізацію Вимкнення синхронізації призведе до виконання обраної поведінки передплати, термін дії якої закінчився, так, ніби термін дії всіх передплат закінчився. Вимкнення синхронізації призведе до виконання обраної поведінки передплати, термін дії якої закінчився, так, ніби термін дії всіх передплат закінчився. @@ -2410,7 +2409,6 @@ Щоб звести кількість спаму до мінімуму, учасники сервера повинні підтвердити свою адресу електронної пошти, перш ніж зможуть відправляти повідомлення. Це не стосується учасників, які мають ролі. Необхідна підтверджена адреса електронної пошти Твій сервер уже відповідає вимогам щодо рівня перевірки або перевищує їх. - Припинити тимчасовий блок для !!{user}!! Увімкнути ігровий оверлей. Увімкнути поглинання шуму Увімкнути сповіщення @@ -3425,9 +3423,7 @@ Банер профілю сервера Профіль сервера — $[](guildIconHook) !!{guildName}!! Встановіть індивідуальний аватар, банер профілю та інформацію про себе на кожному зі своїх серверів та відкрийте більше можливостей з [Discord Nitro!](onAndMore) - Розкажіть про себе більше, відкривши персоналізацію профілю з Nitro. Будьте ким завгодно та використовуйте різні аватари, банери та біографії на всіх своїх серверах, відкрийте анімовані аватари та інші можливості з [Discord Nitro!](onAndMore) - Хочете мати повний доступ до профілю серверів? Запросити на сервери Термін дії запрошень закінчується через {xDays}. Інші сервери @@ -6969,7 +6965,6 @@ Завантажуй персоналізований банер та отримай інші переваги з Discord Nitro! Минуло $[](renderTimeHook) Персоналізація профілю наразі доступна обмеженій кількості людей. - Розкажи світу трохи про себе Розкажіть про себе з інформацією «Про мене» та, якщо ви маєте Nitro, з банером профілю! Зрозуміло Оновити профіль @@ -9237,7 +9232,6 @@ Перезавантаж програму, щоб зміни набули чинності. Зберегти Сканувати QR-код - Хочете змінити профіль для сервера? Ви можете змінити його, перейшовши на сервер. Показати бібліотеку ігор Вимкни цей пункт, щоб приховати свою бібліотеку ігор і сфокусуватися на спілкуванні. Discord запускається в фоновому режимі й не плутається в тебе під ногами diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c7a5445943..581483c99a 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2159,7 +2159,6 @@ Vô Hiệu Hóa Tài Khoản Có chắc là bạn muốn vô hiệu hóa tài khoản của mình không? Thao tác này sẽ ngay lập tức đăng xuất và không ai có thể truy cập vào nữa. Thành công! Chúng tôi đã vô hiệu hóa thông báo email của bạn! - Tạm Dừng !!{user}!! Tắt đồng bộ hóa Việc tắt đồng bộ sẽ thực thi hành động theo dõi hết hạn đã chọn nếu tất cả các theo dõi đã hết hạn. Việc tắt đồng bộ sẽ thực thi hành động hội viên hết hạn đã chọn nếu tất cả các thành viên đã hết hạn. @@ -2410,7 +2409,6 @@ Để hạn chế spam, các thành viên trong máy chủ phải có email được xác minh trước khi có quyền gửi tin nhắn. Không áp dụng cho các thành viên có vai trò. Cần phải xác thực email Máy chủ của bạn đã đáp ứng hoặc vượt quá yêu cầu về mức xác minh. - Gỡ Bỏ Tạm Dừng Cho !!{user}!! Kích hoạt overlay trong game. Bật Chặn Tiếng Ồn Bật thông báo @@ -3425,9 +3423,7 @@ Biểu Ngữ Hồ Sơ Máy Chủ Hồ Sơ Máy Chủ – $[](guildIconHook) !!{guildName}!! Sử dụng ảnh đại diện, biểu ngữ hồ sơ, và thông tin cá nhân khác nhau trong mỗi máy chủ và nhiều tính năng khác với [Discord Nitro!](onAndMore) - Thể hiện bản thân nhiều hơn trong máy chủ này bằng cách mở khóa tất cả tùy chỉnh hồ sơ với Nitro. Trở thành người bạn muốn và sử dụng ảnh đại diện, biểu ngữ, và tiểu sử khác nhau trong mỗi máy chủ, mở khóa hình đại diện hoạt hình, và nhiều hơn nữa với [Discord Nitro!](onAndMore) - Bạn muốn có toàn quyền truy cập vào hồ sơ máy chủ? Mời vào các Máy Chủ Lời mời hết hạn sau {xDays}. Các máy chủ khác @@ -6969,7 +6965,6 @@ Tải lên biểu ngữ được cá nhân hóa của riêng bạn và hơn thế nữa với Discord Nitro! $[](renderTimeHook) đã trôi qua Tùy Chỉnh Hồ Sơ hiện có cho một số người giới hạn. - Hãy giới thiệu với mọi người một chút về bạn Thể hiện bản thân bằng phần giới thiệu về tôi và biểu ngữ hồ sơ nếu bạn có Nitro! Đã rõ Cập nhật hồ sơ của tôi @@ -9237,7 +9232,6 @@ Khởi động lại ứng dụng để cài đặt mới có hiệu lực. Lưu Quét Mã QR - Bạn đang cố thay đổi hồ sơ cho một máy chủ cụ thể? Đi tới máy chủ để chỉnh sửa hồ sơ máy chủ của bạn. Hiển Thị Thư Viện Trò Chơi Tắt tính năng này để ẩn Thư Viện Trò Chơi và tập trung trò chuyện. Discord sẽ hoạt động ngầm và không gây ảnh hưởng gì đến việc sử dụng máy tính của bạn cả. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d03c176ea9..d3b6634756 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2164,7 +2164,6 @@ 关闭账号 确定要关闭您的帐户吗？这将立即退出您的账号，并且任何人都无法访问。 成功，我们已经对您关闭了邮件通知！ - 暂时禁言 !!{user}!! 关闭同步 关闭同步功能将执行所选过期订阅行为，系统将认为所有的订阅都已过期。 关闭同步功能将执行所选过期会员行为，系统将认为所有的会员都已过期。 @@ -2415,7 +2414,6 @@ 为了减少垃圾邮件，服务器成员在发送信息之前，必须持有已通过验证的电子邮件地址。该要求不适用于有身份组的成员。 需要已验证的电子邮件地址 您的服务器已经满足或超过验证级别要求。 - 解除 !!{user}!! 的暂时禁言 开启游戏内叠加面板。 开启降噪功能 开启通知 @@ -3430,9 +3428,7 @@ 服务器个人资料横幅 服务器个人资料 - $[](guildIconHook) !!{guildName}!! 在每个服务器设置不同的头像、个人资料横幅和自我介绍，更多有趣功能尽在 [Discord Nitro！](onAndMore) - 在这个服务器中通过 Nitro 解锁个性化个人资料的全部功能，更好地展现自我。 做百变的自己，在每个服务器使用不同的头像、横幅和自我介绍，解锁动画头像，更多有趣功能尽在 [Discord Nitro！](onAndMore) - 想解锁服务器个人资料的全部功能吗？ 邀请至服务器 邀请将于 {xDays} 天后过期。 其它服务器 @@ -6973,7 +6969,6 @@ 使用 Discord Nitro 上传您自己的个性化横幅及更多内容！ 经过了 $[](renderTimeHook) 当前仅部分用户可自定义个人资料。 - 向世界介绍一下你自己 用“自我介绍”进行自我表达，如果您有 Nitro，还可以使用个人资料横幅！ 了解 更新我的个人资料 @@ -9241,7 +9236,6 @@ 您的新设置会在重启APP后生效。 保存 扫描二维码 - 想要为某个服务器改变您的个人资料？进入该服务器编辑服务器个人资料吧。 显示游戏库 关闭此功能可隐藏您的游戏库，这样您可以集中精力在对话上。 Discord 在后台运行并时刻准备着给您让路。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 442ca58ccc..77fdff076f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2164,7 +2164,6 @@ 停用帳號 您確定要停用帳號嗎？這將會讓您立即登出，而且任何人都無法再登入這個帳號了。 成功！ 我們已經對您停用電子信箱通知！ - 對 !!{user}!! 禁言 停用同步 停用同步功能將會導致已選取的訂閱行為過期有如同所有訂閱都過期。 停用同步功能將會導致已選取的過期成員行為有如所有成員都已過期。 @@ -2415,7 +2414,6 @@ 為了最小化濫發訊息，伺服器的成員必須先驗證電子郵件，才能開始發送訊息。具有身分組的成員不適用這項規定。 需要驗證電子郵件 您的伺服器已達到或超過驗證等級的規定。 - 對 !!{user}!! 解除禁言 啟用遊戲中的嵌入介面。 啟用雜訊抑制 啟用通知 @@ -3430,9 +3428,7 @@ 伺服器個人資料橫幅 伺服器個人資料 - $[](guildIconHook) !!{guildName}!! 取得 [Discord Nitro](onAndMore)，就能在各個伺服器設定不同的頭像、個人資料橫幅和簡介，還能盡享更多好處 ！ - 使用 Nitro 訂閱，就能解鎖所有個人資料自訂功能，讓您在這個伺服器中更能表現自我。 取得 [Discord Nitro](onAndMore)，就能隨心化身為您喜愛的形象，在各個伺服器使用不同的頭像、橫幅與簡介，還能解鎖動態頭像並盡享其他更多好處！ - 想要使用伺服器個人資料的全部功能？ 邀請加入伺服器 邀請將在 {xDays} 後過期。 其他伺服器 @@ -6973,7 +6969,6 @@ 透過 Discord Nitro 上傳屬於您自己的個性化橫幅，還能體驗其他更多功能！ 經過時間 $[](renderTimeHook) 個人資料自訂目前僅開放部分人使用。 - 向大家稍微介紹一下您自己 在「關於我」介紹自己。如果您有 Nitro 訂閱，則可利用個人資料橫幅！ 知道了 更新我的個人資料 @@ -9246,7 +9241,6 @@ 重新啟動程式來套用你的新設定。 儲存 掃描 QR Code - 想要在特定的伺服器變更個人資料嗎？前往伺服器編輯您的伺服器個人資料。 顯示遊戲庫 將此選項關閉，就能隱藏遊戲庫，讓您專心對話。 Discord 會在背景執行，且不干擾您。 diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index fb2bb436b6..b44f61a115 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -4095,1079 +4095,1080 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19676,5343 +19677,5344 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 568c0d9d3f..e3a9dff331 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1532,7 +1532,7 @@ Select a color Transparency Use Default - a182c9a7f6004c4b9db384faa2821bc1 + 896ea14a6b9346899e005fe125ba6039 Coming Soon Slash command application {applicationName} {applicationName} application @@ -3460,7 +3460,7 @@ Wanna join more servers? Upgrade to Discord Nitro to join up to 200 servers! This reason will be recorded in the audit log. - When you put a user in timeout they will not be able to send messages in chat, reply within threads, react to messages, or speak in voice or stage channels + When you put a user in timeout they will not be able to send messages in chat, reply within threads, react to messages, or speak in voice or stage channels. [Learn More]({link}) {guildName} has put you in time out mode for {time}. You can not reply, react, message or speak in voice the duration of your time out. [Learn more]({link}) Time Out Mode You can not reply, react, message or speak in voice. [Learn more]({link}) @@ -3537,7 +3537,7 @@ {count} for {query} Explore Public Servers View - Remove it now to let them post and react to messages, and speak in voice and stage channels. [Learn More](https://www.google.com) + Remove it now to let them post and react to messages, and speak in voice and stage channels. [Learn More]({link}) Remove Timeout !!{user}!! timeout ended !!{username}!! has $[](countdown) remaining in their timeout. @@ -3663,9 +3663,9 @@ Server Profile Banner Server Profile - $[](guildIconHook) !!{guildName}!! Set a different avatar, profile banner, and about me in each of your servers and more with [Discord Nitro!](onAndMore) - Express yourself even more in this server by unlocking all the profile customizations with Nitro. + Need more? Get full server profile customization with Nitro. Be who you want and use a different avatar, banner, and bio in each of your servers, unlock animated avatars, and more with [Discord Nitro!](onAndMore) - Want full access to server profiles? + Express yourself fully with server profiles Invite to Servers Invites expire in {xDays}. Other servers @@ -5080,6 +5080,8 @@ Are you sure you want to remove !!{guildName}!! from this Student Hub? Edit settings Edit Settings for !!{guildName}!! + Add your server to the hub, create an event in your server, and select Share to Student Hubs in the Event Settings. + Want to promote events in Hubs? What’s a Student Hub? Go to a different school? [Join here](onClick) You\'ve been invited to join a Hub @@ -6262,8 +6264,8 @@ Members with this permission can drag other members out of this channel. They can only move members between channels both they and the member they are moving have access. Move To User has been moved to the selected channel. - Alert Cleared - No Alert Showing + Alert Cleared + No Alert Showing New notification Remove %1$s More than %1$d new notifications @@ -7619,7 +7621,7 @@ Upload your own personalized banner and more with Discord Nitro! $[](renderTimeHook) elapsed Profile Customization is currently available to a limited number of people. - Tell the world a little about yourself + Tell this server a bit about yourself Express yourself with an about me and, if you have Nitro, a profile banner! Got it Update my profile @@ -10089,7 +10091,6 @@ Restart the app for your new settings to take effect. Save Scan QR Code - Trying to change your profile for a specific server? Go to the server to edit your server profile. Show Game Library Turn this off to hide your Game Library so you can focus on your conversations. Discord starts in the background and remains out of your way.