diff --git a/app/build.gradle b/app/build.gradle index 843d161f98..6009ec270e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 102202 - versionName "102.2 - Alpha" + versionCode 102203 + versionName "102.3 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 60c2be9ae1..d22257874d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + @@ -82,13 +82,10 @@ - - - @@ -97,7 +94,6 @@ - @@ -107,18 +103,14 @@ - - - - @@ -129,11 +121,8 @@ - - - diff --git a/app/src/main/java/c/a/b/a.java b/app/src/main/java/c/a/b/a.java index e0cd8ae750..06fcd1e8eb 100644 --- a/app/src/main/java/c/a/b/a.java +++ b/app/src/main/java/c/a/b/a.java @@ -76,7 +76,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.i), o.to(ApplicationStatus.class, C0023a.C), o.to(UtcDateTime.class, C0023a.G), o.to(NsfwAllowance.class, C0023a.H), o.to(PremiumTier.class, C0023a.I), o.to(ActivityType.class, C0023a.J), o.to(Phone.class, C0023a.K), o.to(ApplicationCommandType.class, C0023a.L), o.to(OAuthScope.class, C0023a.M), o.to(GuildVerificationLevel.class, C0023a.i), o.to(GuildExplicitContentFilter.class, C0023a.j), o.to(GuildMaxVideoChannelUsers.class, C0023a.k), o.to(ComponentType.class, C0023a.l), o.to(ButtonStyle.class, C0023a.m), o.to(ReportNodeChild.class, C0023a.n), o.to(ReportNodeElementData.class, C0023a.o), o.to(ReportNodeBottomButton.class, C0023a.p), o.to(ApplicationCommandPermissionType.class, C0023a.q), o.to(StageInstancePrivacyLevel.class, C0023a.r), o.to(FriendSuggestionReasonType.class, C0023a.f41s), o.to(AllowedInSuggestionsType.class, C0023a.t), o.to(StickerFormatType.class, C0023a.u), o.to(LocalizedString.class, C0023a.v), o.to(MessageActivityType.class, C0023a.w), o.to(EmbedType.class, C0023a.f42x), o.to(StickerType.class, C0023a.f43y), o.to(GuildScheduledEventStatus.class, C0023a.f44z), o.to(GuildScheduledEventEntityType.class, C0023a.A), o.to(Science.Event.SchemaObject.class, C0023a.B), o.to(GuildRoleSubscriptionBenefitType.class, C0023a.D), o.to(PriceTierType.class, C0023a.E), o.to(ApplicationType.class, C0023a.F)); + public static final Map, Function0> a = h0.mapOf(o.to(ActivityPlatform.class, b.i), o.to(ActivityType.class, C0023a.C), o.to(ApplicationStatus.class, C0023a.H), o.to(UtcDateTime.class, C0023a.I), o.to(NsfwAllowance.class, C0023a.J), o.to(PremiumTier.class, C0023a.K), o.to(ActivityType.class, C0023a.L), o.to(Phone.class, C0023a.M), o.to(ApplicationCommandType.class, C0023a.N), o.to(OAuthScope.class, C0023a.i), o.to(GuildVerificationLevel.class, C0023a.j), o.to(GuildExplicitContentFilter.class, C0023a.k), o.to(GuildMaxVideoChannelUsers.class, C0023a.l), o.to(ComponentType.class, C0023a.m), o.to(ButtonStyle.class, C0023a.n), o.to(ReportNodeChild.class, C0023a.o), o.to(ReportNodeElementData.class, C0023a.p), o.to(ReportNodeBottomButton.class, C0023a.q), o.to(ApplicationCommandPermissionType.class, C0023a.r), o.to(StageInstancePrivacyLevel.class, C0023a.f41s), o.to(FriendSuggestionReasonType.class, C0023a.t), o.to(AllowedInSuggestionsType.class, C0023a.u), o.to(StickerFormatType.class, C0023a.v), o.to(LocalizedString.class, C0023a.w), o.to(MessageActivityType.class, C0023a.f42x), o.to(EmbedType.class, C0023a.f43y), o.to(StickerType.class, C0023a.f44z), o.to(GuildScheduledEventStatus.class, C0023a.A), o.to(GuildScheduledEventEntityType.class, C0023a.B), o.to(Science.Event.SchemaObject.class, C0023a.D), o.to(GuildRoleSubscriptionBenefitType.class, C0023a.E), o.to(PriceTierType.class, C0023a.F), o.to(ApplicationType.class, C0023a.G)); public static final List b = n.listOf((Object[]) new c.i.d.o[]{ComponentRuntimeTypeAdapter.INSTANCE.a(), new NullSerializableTypeAdapterFactory()}); /* compiled from: kotlin-style lambda group */ @@ -95,6 +95,7 @@ public final class a { public static final C0023a K = new C0023a(28); public static final C0023a L = new C0023a(29); public static final C0023a M = new C0023a(30); + public static final C0023a N = new C0023a(31); public static final C0023a i = new C0023a(0); public static final C0023a j = new C0023a(1); public static final C0023a k = new C0023a(2); @@ -121,80 +122,82 @@ public final class a { /* renamed from: z reason: collision with root package name */ public static final C0023a f44z = new C0023a(17); - public final /* synthetic */ int N; + public final /* synthetic */ int O; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public C0023a(int i2) { super(0); - this.N = i2; + this.O = i2; } @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Object mo1invoke() { - switch (this.N) { + switch (this.O) { case 0: - return new GuildVerificationLevelTypeAdapter(); - case 1: - return new GuildExplicitContentFilterTypeAdapter(); - case 2: - return new GuildMaxVideoChannelUsersTypeAdapter(); - case 3: - return new ComponentTypeTypeAdapter(); - case 4: - return new ButtonStyleTypeAdapter(); - case 5: - return new ReportNodeChildTypeAdapter(); - case 6: - return new ReportNodeElementDataTypeAdapter(); - case 7: - return new ReportNodeBottomButtonTypeAdapter(); - case 8: - return new ApplicationCommandPermissionTypeTypeAdapter(); - case 9: - return new StageInstancePrivacyLevelTypeAdapter(); - case 10: - return new FriendSuggestionReasonTypeAdapter(); - case 11: - return new AllowedInSuggestionsTypeAdapter(); - case 12: - return new StickerFormatTypeTypeAdapter(); - case 13: - return new LocalizedStringTypeAdapter(); - case 14: - return new MessageActivityTypeTypeAdapter(); - case 15: - return new EmbedTypeTypeAdapter(); - case 16: - return new StickerTypeTypeAdapter(); - case 17: - return new GuildScheduledEventStatusTypeAdapter(); - case 18: - return new GuildScheduledEventEntityTypeTypeAdapter(); - case 19: - return new AnalyticsSchemaTypeAdapter(); - case 20: - return new ApplicationStatusTypeAdapter(); - case 21: - return new GuildRoleSubscriptionBenefitTypeAdapter(); - case 22: - return new PriceTierTypeAdapter(); - case 23: - return new ApplicationTypeAdapter(); - case 24: - return new UtcDateTimeTypeAdapter(); - case 25: - return new NsfwAllowanceTypeAdapter(); - case 26: - return new PremiumTierTypeAdapter(); - case 27: - return new ActivityTypeTypeAdapter(); - case 28: - return new PhoneTypeAdapter(); - case 29: - return new CommandTypeAdapter(); - case 30: return new OAuthScopeTypeAdapter(); + case 1: + return new GuildVerificationLevelTypeAdapter(); + case 2: + return new GuildExplicitContentFilterTypeAdapter(); + case 3: + return new GuildMaxVideoChannelUsersTypeAdapter(); + case 4: + return new ComponentTypeTypeAdapter(); + case 5: + return new ButtonStyleTypeAdapter(); + case 6: + return new ReportNodeChildTypeAdapter(); + case 7: + return new ReportNodeElementDataTypeAdapter(); + case 8: + return new ReportNodeBottomButtonTypeAdapter(); + case 9: + return new ApplicationCommandPermissionTypeTypeAdapter(); + case 10: + return new StageInstancePrivacyLevelTypeAdapter(); + case 11: + return new FriendSuggestionReasonTypeAdapter(); + case 12: + return new AllowedInSuggestionsTypeAdapter(); + case 13: + return new StickerFormatTypeTypeAdapter(); + case 14: + return new LocalizedStringTypeAdapter(); + case 15: + return new MessageActivityTypeTypeAdapter(); + case 16: + return new EmbedTypeTypeAdapter(); + case 17: + return new StickerTypeTypeAdapter(); + case 18: + return new GuildScheduledEventStatusTypeAdapter(); + case 19: + return new GuildScheduledEventEntityTypeTypeAdapter(); + case 20: + return new ActivityTypeTypeAdapter(); + case 21: + return new AnalyticsSchemaTypeAdapter(); + case 22: + return new GuildRoleSubscriptionBenefitTypeAdapter(); + case 23: + return new PriceTierTypeAdapter(); + case 24: + return new ApplicationTypeAdapter(); + case 25: + return new ApplicationStatusTypeAdapter(); + case 26: + return new UtcDateTimeTypeAdapter(); + case 27: + return new NsfwAllowanceTypeAdapter(); + case 28: + return new PremiumTierTypeAdapter(); + case 29: + return new ActivityTypeTypeAdapter(); + case 30: + return new PhoneTypeAdapter(); + case 31: + return new CommandTypeAdapter(); default: throw null; } diff --git a/app/src/main/java/com/discord/api/activity/ActivitySecrets.java b/app/src/main/java/com/discord/api/activity/ActivitySecrets.java new file mode 100644 index 0000000000..65d3749a9a --- /dev/null +++ b/app/src/main/java/com/discord/api/activity/ActivitySecrets.java @@ -0,0 +1,38 @@ +package com.discord.api.activity; + +import c.d.b.a.a; +import d0.z.d.m; +/* compiled from: ActivitySecrets.kt */ +public final class ActivitySecrets { + private final String join; + private final String match; + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof ActivitySecrets)) { + return false; + } + ActivitySecrets activitySecrets = (ActivitySecrets) obj; + return m.areEqual(this.match, activitySecrets.match) && m.areEqual(this.join, activitySecrets.join); + } + + public int hashCode() { + String str = this.match; + int i = 0; + int hashCode = (str != null ? str.hashCode() : 0) * 31; + String str2 = this.join; + if (str2 != null) { + i = str2.hashCode(); + } + return hashCode + i; + } + + public String toString() { + StringBuilder R = a.R("ActivitySecrets(match="); + R.append(this.match); + R.append(", join="); + return a.H(R, this.join, ")"); + } +} diff --git a/app/src/main/java/com/discord/api/activity/ActivityType.java b/app/src/main/java/com/discord/api/activity/ActivityType.java index 4e4c5627e5..4db96c9c3e 100644 --- a/app/src/main/java/com/discord/api/activity/ActivityType.java +++ b/app/src/main/java/com/discord/api/activity/ActivityType.java @@ -1,4 +1,6 @@ package com.discord.api.activity; + +import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: ActivityType.kt */ public enum ActivityType { PLAYING(0), @@ -9,8 +11,18 @@ public enum ActivityType { COMPETING(5), UNKNOWN(-1); + public static final Companion Companion = new Companion(null); private final int apiInt; + /* compiled from: ActivityType.kt */ + public static final class Companion { + public Companion() { + } + + public Companion(DefaultConstructorMarker defaultConstructorMarker) { + } + } + private ActivityType(int i) { this.apiInt = i; } diff --git a/app/src/main/java/com/discord/api/activity/ActivityTypeTypeAdapter.java b/app/src/main/java/com/discord/api/activity/ActivityTypeTypeAdapter.java index d0d67b24c5..92c0b54e3d 100644 --- a/app/src/main/java/com/discord/api/activity/ActivityTypeTypeAdapter.java +++ b/app/src/main/java/com/discord/api/activity/ActivityTypeTypeAdapter.java @@ -1,31 +1,48 @@ package com.discord.api.activity; +import c.c.a.a0.d; +import com.discord.api.activity.ActivityType; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import d0.z.d.m; +import java.util.Objects; /* compiled from: ActivityType.kt */ public final class ActivityTypeTypeAdapter extends TypeAdapter { /* Return type fixed from 'java.lang.Object' to match base method */ @Override // com.google.gson.TypeAdapter public ActivityType read(JsonReader jsonReader) { - ActivityType activityType; m.checkNotNullParameter(jsonReader, "in"); - int y2 = jsonReader.y(); - ActivityType[] values = ActivityType.values(); - int i = 0; - while (true) { - if (i >= 7) { - activityType = null; - break; - } - activityType = values[i]; - if (activityType.getApiInt$discord_api() == y2) { - break; - } - i++; + ActivityType.Companion companion = ActivityType.Companion; + Integer l1 = d.l1(jsonReader); + Objects.requireNonNull(companion); + ActivityType activityType = ActivityType.PLAYING; + int apiInt$discord_api = activityType.getApiInt$discord_api(); + if (l1 != null && l1.intValue() == apiInt$discord_api) { + return activityType; } - return activityType != null ? activityType : ActivityType.UNKNOWN; + ActivityType activityType2 = ActivityType.STREAMING; + int apiInt$discord_api2 = activityType2.getApiInt$discord_api(); + if (l1 != null && l1.intValue() == apiInt$discord_api2) { + return activityType2; + } + ActivityType activityType3 = ActivityType.LISTENING; + int apiInt$discord_api3 = activityType3.getApiInt$discord_api(); + if (l1 != null && l1.intValue() == apiInt$discord_api3) { + return activityType3; + } + ActivityType activityType4 = ActivityType.WATCHING; + int apiInt$discord_api4 = activityType4.getApiInt$discord_api(); + if (l1 != null && l1.intValue() == apiInt$discord_api4) { + return activityType4; + } + ActivityType activityType5 = ActivityType.CUSTOM_STATUS; + int apiInt$discord_api5 = activityType5.getApiInt$discord_api(); + if (l1 != null && l1.intValue() == apiInt$discord_api5) { + return activityType5; + } + ActivityType activityType6 = ActivityType.COMPETING; + return (l1 != null && l1.intValue() == activityType6.getApiInt$discord_api()) ? activityType6 : ActivityType.UNKNOWN; } /* JADX DEBUG: Method arguments types fixed to match base method, original types: [com.google.gson.stream.JsonWriter, java.lang.Object] */ diff --git a/app/src/main/java/com/discord/api/commands/ApplicationCommandType.java b/app/src/main/java/com/discord/api/commands/ApplicationCommandType.java index aef227c3fc..453571bc78 100644 --- a/app/src/main/java/com/discord/api/commands/ApplicationCommandType.java +++ b/app/src/main/java/com/discord/api/commands/ApplicationCommandType.java @@ -13,6 +13,7 @@ public enum ApplicationCommandType { ROLE(8), MENTIONABLE(9), NUMBER(10), + ATTACHMENT(11), UNKNOWN(0); public static final Companion Companion = new Companion(null); diff --git a/app/src/main/java/com/discord/api/commands/CommandTypeAdapter.java b/app/src/main/java/com/discord/api/commands/CommandTypeAdapter.java index 2998ae9d6a..6d460248b8 100644 --- a/app/src/main/java/com/discord/api/commands/CommandTypeAdapter.java +++ b/app/src/main/java/com/discord/api/commands/CommandTypeAdapter.java @@ -36,6 +36,8 @@ public final class CommandTypeAdapter extends TypeAdapter>> 32))) * 31; + ActivityAssets activityAssets = this.assets; + int i2 = 0; + int hashCode = (i + (activityAssets != null ? activityAssets.hashCode() : 0)) * 31; + Long l = this.createdAt; + int hashCode2 = (hashCode + (l != null ? l.hashCode() : 0)) * 31; + String str = this.details; + int hashCode3 = (hashCode2 + (str != null ? str.hashCode() : 0)) * 31; + String str2 = this.name; + int hashCode4 = (hashCode3 + (str2 != null ? str2.hashCode() : 0)) * 31; + ActivitySecrets activitySecrets = this.secrets; + int hashCode5 = (hashCode4 + (activitySecrets != null ? activitySecrets.hashCode() : 0)) * 31; + String str3 = this.state; + int hashCode6 = (hashCode5 + (str3 != null ? str3.hashCode() : 0)) * 31; + ActivityTimestamps activityTimestamps = this.timestamps; + int hashCode7 = (hashCode6 + (activityTimestamps != null ? activityTimestamps.hashCode() : 0)) * 31; + ActivityType activityType = this.type; + if (activityType != null) { + i2 = activityType.hashCode(); + } + return hashCode7 + i2; + } + + public final ActivityType i() { + return this.type; + } + + public String toString() { + StringBuilder R = a.R("EmbeddedActivity(applicationId="); + R.append(this.applicationId); + R.append(", assets="); + R.append(this.assets); + R.append(", createdAt="); + R.append(this.createdAt); + R.append(", details="); + R.append(this.details); + R.append(", name="); + R.append(this.name); + R.append(", secrets="); + R.append(this.secrets); + R.append(", state="); + R.append(this.state); + R.append(", timestamps="); + R.append(this.timestamps); + R.append(", type="); + R.append(this.type); + R.append(")"); + return R.toString(); + } +} diff --git a/app/src/main/java/com/discord/api/embeddedactivities/EmbeddedActivityInGuild.java b/app/src/main/java/com/discord/api/embeddedactivities/EmbeddedActivityInGuild.java new file mode 100644 index 0000000000..35ed8aaa85 --- /dev/null +++ b/app/src/main/java/com/discord/api/embeddedactivities/EmbeddedActivityInGuild.java @@ -0,0 +1,56 @@ +package com.discord.api.embeddedactivities; + +import c.d.b.a.a; +import d0.z.d.m; +import java.util.List; +/* compiled from: EmbeddedActivityInGuild.kt */ +public final class EmbeddedActivityInGuild { + private final long channelId; + private final EmbeddedActivity embeddedActivity; + private final List users; + + public final long a() { + return this.channelId; + } + + public final EmbeddedActivity b() { + return this.embeddedActivity; + } + + public final List c() { + return this.users; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof EmbeddedActivityInGuild)) { + return false; + } + EmbeddedActivityInGuild embeddedActivityInGuild = (EmbeddedActivityInGuild) obj; + return this.channelId == embeddedActivityInGuild.channelId && m.areEqual(this.embeddedActivity, embeddedActivityInGuild.embeddedActivity) && m.areEqual(this.users, embeddedActivityInGuild.users); + } + + public int hashCode() { + long j = this.channelId; + int i = ((int) (j ^ (j >>> 32))) * 31; + EmbeddedActivity embeddedActivity = this.embeddedActivity; + int i2 = 0; + int hashCode = (i + (embeddedActivity != null ? embeddedActivity.hashCode() : 0)) * 31; + List list = this.users; + if (list != null) { + i2 = list.hashCode(); + } + return hashCode + i2; + } + + public String toString() { + StringBuilder R = a.R("EmbeddedActivityInGuild(channelId="); + R.append(this.channelId); + R.append(", embeddedActivity="); + R.append(this.embeddedActivity); + R.append(", users="); + return a.J(R, this.users, ")"); + } +} diff --git a/app/src/main/java/com/discord/api/embeddedactivities/EmbeddedActivityInboundUpdate.java b/app/src/main/java/com/discord/api/embeddedactivities/EmbeddedActivityInboundUpdate.java new file mode 100644 index 0000000000..215fac6175 --- /dev/null +++ b/app/src/main/java/com/discord/api/embeddedactivities/EmbeddedActivityInboundUpdate.java @@ -0,0 +1,65 @@ +package com.discord.api.embeddedactivities; + +import c.d.b.a.a; +import d0.z.d.m; +import java.util.List; +/* compiled from: EmbeddedActivityInboundUpdate.kt */ +public final class EmbeddedActivityInboundUpdate { + private final long channelId; + private final EmbeddedActivity embeddedActivity; + private final long guildId; + private final List users; + + public final long a() { + return this.channelId; + } + + public final EmbeddedActivity b() { + return this.embeddedActivity; + } + + public final long c() { + return this.guildId; + } + + public final List d() { + return this.users; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof EmbeddedActivityInboundUpdate)) { + return false; + } + EmbeddedActivityInboundUpdate embeddedActivityInboundUpdate = (EmbeddedActivityInboundUpdate) obj; + return this.channelId == embeddedActivityInboundUpdate.channelId && m.areEqual(this.embeddedActivity, embeddedActivityInboundUpdate.embeddedActivity) && this.guildId == embeddedActivityInboundUpdate.guildId && m.areEqual(this.users, embeddedActivityInboundUpdate.users); + } + + public int hashCode() { + long j = this.channelId; + int i = ((int) (j ^ (j >>> 32))) * 31; + EmbeddedActivity embeddedActivity = this.embeddedActivity; + int i2 = 0; + int hashCode = embeddedActivity != null ? embeddedActivity.hashCode() : 0; + long j2 = this.guildId; + int i3 = (((i + hashCode) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31; + List list = this.users; + if (list != null) { + i2 = list.hashCode(); + } + return i3 + i2; + } + + public String toString() { + StringBuilder R = a.R("EmbeddedActivityInboundUpdate(channelId="); + R.append(this.channelId); + R.append(", embeddedActivity="); + R.append(this.embeddedActivity); + R.append(", guildId="); + R.append(this.guildId); + R.append(", users="); + return a.J(R, this.users, ")"); + } +} 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 71d2b07a14..bd0750d7a7 100644 --- a/app/src/main/java/com/discord/api/guild/Guild.java +++ b/app/src/main/java/com/discord/api/guild/Guild.java @@ -3,6 +3,7 @@ package com.discord.api.guild; import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure; import c.d.b.a.a; import com.discord.api.channel.Channel; +import com.discord.api.embeddedactivities.EmbeddedActivityInGuild; import com.discord.api.emoji.GuildEmoji; import com.discord.api.guild.welcome.GuildWelcomeScreen; import com.discord.api.guildhash.GuildHashes; @@ -28,6 +29,7 @@ public final class Guild { private final List channels; private final Integer defaultMessageNotifications; private final String description; + private final List embeddedActivities; private final List emojis; private final GuildExplicitContentFilter explicitContentFilter; private final List features; @@ -66,11 +68,12 @@ public final class Guild { private final List voiceStates; private final GuildWelcomeScreen welcomeScreen; - /* JADX DEBUG: Multi-variable search result rejected for r29v0, resolved type: java.util.List */ + /* JADX DEBUG: Multi-variable search result rejected for r30v0, 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) { + 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) { m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME); m.checkNotNullParameter(list8, "features"); + m.checkNotNullParameter(list13, "embeddedActivities"); this.roles = list; this.emojis = list2; this.stickers = list3; @@ -115,12 +118,13 @@ public final class Guild { this.nsfw = z3; this.stageInstances = list11; this.guildScheduledEvents = list12; + this.embeddedActivities = list13; } - 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, int i9, int i10) { - List list13 = (i9 & 1) != 0 ? guild.roles : list; - List list14 = (i9 & 2) != 0 ? guild.emojis : list2; - List list15 = (i9 & 4) != 0 ? guild.stickers : list3; + 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) { + List list14 = (i9 & 1) != 0 ? guild.roles : list; + List list15 = (i9 & 2) != 0 ? guild.emojis : list2; + List list16 = (i9 & 4) != 0 ? guild.stickers : list3; String str10 = (i9 & 8) != 0 ? guild.name : str; String str11 = (i9 & 16) != 0 ? guild.description : str2; Integer num3 = (i9 & 32) != 0 ? guild.defaultMessageNotifications : num; @@ -130,10 +134,9 @@ public final class Guild { String str13 = (i9 & 512) != 0 ? guild.icon : str4; GuildVerificationLevel guildVerificationLevel2 = (i9 & 1024) != 0 ? guild.verificationLevel : guildVerificationLevel; GuildExplicitContentFilter guildExplicitContentFilter2 = (i9 & 2048) != 0 ? guild.explicitContentFilter : guildExplicitContentFilter; - List list16 = (i9 & 4096) != 0 ? guild.presences : list4; - List list17 = (i9 & 8192) != 0 ? guild.channels : list5; - List list18 = (i9 & 16384) != 0 ? guild.members : list6; - List list19 = null; + 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 = (i9 & 32768) != 0 ? guild.voiceStates : null; boolean z4 = (i9 & 65536) != 0 ? guild.unavailable : z2; int i11 = (i9 & 131072) != 0 ? guild.mfaLevel : i; @@ -162,80 +165,84 @@ public final class Guild { List list23 = (i10 & 256) != 0 ? guild.threads : null; boolean z5 = (i10 & 512) != 0 ? guild.nsfw : z3; List list24 = (i10 & 1024) != 0 ? guild.stageInstances : null; - if ((i10 & 2048) != 0) { - list19 = guild.guildScheduledEvents; - } + List list25 = (i10 & 2048) != 0 ? guild.guildScheduledEvents : null; + List list26 = (i10 & 4096) != 0 ? guild.embeddedActivities : null; Objects.requireNonNull(guild); m.checkNotNullParameter(str10, ModelAuditLogEntry.CHANGE_KEY_NAME); m.checkNotNullParameter(list21, "features"); - return new Guild(list13, list14, list15, str10, str11, num3, j3, str12, j4, str13, guildVerificationLevel2, guildExplicitContentFilter2, list16, list17, list18, 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, list19); + m.checkNotNullParameter(list26, "embeddedActivities"); + 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); } public final int A() { + return this.premiumSubscriptionCount; + } + + public final int B() { return this.premiumTier; } - public final List B() { + public final List C() { return this.presences; } - public final Long C() { + public final Long D() { return this.publicUpdatesChannelId; } - public final String D() { + public final String E() { return this.region; } - public final List E() { + public final List F() { return this.roles; } - public final Long F() { + public final Long G() { return this.rulesChannelId; } - public final String G() { + public final String H() { return this.splash; } - public final List H() { + public final List I() { return this.stageInstances; } - public final List I() { + public final List J() { return this.stickers; } - public final int J() { + public final int K() { return this.systemChannelFlags; } - public final Long K() { + public final Long L() { return this.systemChannelId; } - public final List L() { + public final List M() { return this.threads; } - public final boolean M() { + public final boolean N() { return this.unavailable; } - public final String N() { + public final String O() { return this.vanityUrlCode; } - public final GuildVerificationLevel O() { + public final GuildVerificationLevel P() { return this.verificationLevel; } - public final List P() { + public final List Q() { return this.voiceStates; } - public final GuildWelcomeScreen Q() { + public final GuildWelcomeScreen R() { return this.welcomeScreen; } @@ -263,7 +270,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.f1606id == guild.f1606id && 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); + 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.f1606id == guild.f1606id && 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); } public final List f() { @@ -361,60 +368,62 @@ public final class Guild { List list11 = this.stageInstances; int hashCode31 = (i9 + (list11 != null ? list11.hashCode() : 0)) * 31; List list12 = this.guildScheduledEvents; - if (list12 != null) { - i = list12.hashCode(); + int hashCode32 = (hashCode31 + (list12 != null ? list12.hashCode() : 0)) * 31; + List list13 = this.embeddedActivities; + if (list13 != null) { + i = list13.hashCode(); } - return hashCode31 + i; + return hashCode32 + i; } public final String i() { return this.description; } - public final List j() { + public final List j() { + return this.embeddedActivities; + } + + public final List k() { return this.emojis; } - public final GuildExplicitContentFilter k() { + public final GuildExplicitContentFilter l() { return this.explicitContentFilter; } - public final List l() { + public final List m() { return this.features; } - public final GuildHashes m() { + public final GuildHashes n() { return this.guildHashes; } - public final List n() { + public final List o() { return this.guildScheduledEvents; } - public final String o() { + public final String p() { return this.icon; } - public final long p() { + public final long q() { return this.f1606id; } - public final String q() { + public final String r() { return this.joinedAt; } - public final GuildMaxVideoChannelUsers r() { + public final GuildMaxVideoChannelUsers s() { return this.maxVideoChannelUsers; } - public final int s() { + public final int t() { return this.memberCount; } - public final List t() { - return this.members; - } - public String toString() { StringBuilder R = a.R("Guild(roles="); R.append(this.roles); @@ -503,30 +512,32 @@ public final class Guild { R.append(", stageInstances="); R.append(this.stageInstances); R.append(", guildScheduledEvents="); - return a.J(R, this.guildScheduledEvents, ")"); + R.append(this.guildScheduledEvents); + R.append(", embeddedActivities="); + return a.J(R, this.embeddedActivities, ")"); } - public final int u() { + public final List u() { + return this.members; + } + + public final int v() { return this.mfaLevel; } - public final String v() { + public final String w() { return this.name; } - public final boolean w() { + public final boolean x() { return this.nsfw; } - public final long x() { + public final long y() { return this.ownerId; } - public final String y() { + public final String z() { return this.preferredLocale; } - - public final int z() { - return this.premiumSubscriptionCount; - } } diff --git a/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEventStatus.java b/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEventStatus.java index 8d44a7cb7d..5d3954436c 100644 --- a/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEventStatus.java +++ b/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEventStatus.java @@ -1,5 +1,7 @@ package com.discord.api.guildscheduledevent; +import d0.t.n0; +import java.util.Set; import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: GuildScheduledEventStatus.kt */ public enum GuildScheduledEventStatus { @@ -10,6 +12,7 @@ public enum GuildScheduledEventStatus { UNKNOWN(0); public static final Companion Companion = new Companion(null); + private static final Set DONE = n0.setOf((Object[]) new GuildScheduledEventStatus[]{COMPLETED, CANCELED}); private final int apiValue; /* compiled from: GuildScheduledEventStatus.kt */ @@ -25,6 +28,10 @@ public enum GuildScheduledEventStatus { this.apiValue = i; } + public static final /* synthetic */ Set access$getDONE$cp() { + return DONE; + } + public final int getApiValue() { return this.apiValue; } diff --git a/app/src/main/java/com/discord/gateway/io/IncomingParser.java b/app/src/main/java/com/discord/gateway/io/IncomingParser.java index 88557cc82d..a11e196209 100644 --- a/app/src/main/java/com/discord/gateway/io/IncomingParser.java +++ b/app/src/main/java/com/discord/gateway/io/IncomingParser.java @@ -3,6 +3,7 @@ package com.discord.gateway.io; import c.d.b.a.a; import com.discord.api.commands.ApplicationCommandAutocompleteResult; import com.discord.api.commands.GuildApplicationCommands; +import com.discord.api.embeddedactivities.EmbeddedActivityInboundUpdate; import com.discord.api.emoji.GuildEmojisUpdate; import com.discord.api.friendsuggestions.FriendSuggestion; import com.discord.api.friendsuggestions.FriendSuggestionDelete; @@ -145,7 +146,7 @@ public final class IncomingParser implements Model { r6.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r7, com.discord.api.interaction.InteractionStateUpdate.class); */ /* JADX WARNING: Code restructure failed: missing block: B:187:0x044d, code lost: - if (r3.equals("MESSAGE_REACTION_ADD") != false) goto L_0x05a3; + if (r3.equals("MESSAGE_REACTION_ADD") != false) goto L_0x05b5; */ /* JADX WARNING: Code restructure failed: missing block: B:189:0x0457, code lost: if (r3.equals("STAGE_INSTANCE_DELETE") != false) goto L_0x0489; @@ -175,73 +176,73 @@ public final class IncomingParser implements Model { r6.data = r7.parse(new com.discord.models.domain.ModelUserRelationship()); */ /* JADX WARNING: Code restructure failed: missing block: B:215:0x04f2, code lost: - if (r3.equals("MESSAGE_REACTION_REMOVE_ALL") != false) goto L_0x05a3; + if (r3.equals("MESSAGE_REACTION_REMOVE_ALL") != false) goto L_0x05b5; */ /* JADX WARNING: Code restructure failed: missing block: B:217:0x04fc, code lost: - if (r3.equals("GUILD_JOIN_REQUEST_UPDATE") != false) goto L_0x0592; + if (r3.equals("GUILD_JOIN_REQUEST_UPDATE") != false) goto L_0x05a4; */ - /* JADX WARNING: Code restructure failed: missing block: B:225:0x052a, code lost: - if (r3.equals("USER_CONNECTIONS_INTEGRATION_JOINING") != false) goto L_0x052c; + /* JADX WARNING: Code restructure failed: missing block: B:228:0x053c, code lost: + if (r3.equals("USER_CONNECTIONS_INTEGRATION_JOINING") != false) goto L_0x053e; */ - /* JADX WARNING: Code restructure failed: missing block: B:226:0x052c, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:229:0x053e, code lost: r7.skipValue(); r6.data = kotlin.Unit.a; */ - /* JADX WARNING: Code restructure failed: missing block: B:243:0x0590, code lost: - if (r3.equals("GUILD_JOIN_REQUEST_CREATE") != false) goto L_0x0592; + /* JADX WARNING: Code restructure failed: missing block: B:246:0x05a2, code lost: + if (r3.equals("GUILD_JOIN_REQUEST_CREATE") != false) goto L_0x05a4; */ - /* JADX WARNING: Code restructure failed: missing block: B:244:0x0592, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:247:0x05a4, code lost: r6.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r7, com.discord.api.guildjoinrequest.GuildJoinRequestCreateOrUpdate.class); */ - /* JADX WARNING: Code restructure failed: missing block: B:246:0x05a1, code lost: - if (r3.equals("MESSAGE_REACTION_REMOVE_EMOJI") != false) goto L_0x05a3; + /* JADX WARNING: Code restructure failed: missing block: B:249:0x05b3, code lost: + if (r3.equals("MESSAGE_REACTION_REMOVE_EMOJI") != false) goto L_0x05b5; */ - /* JADX WARNING: Code restructure failed: missing block: B:247:0x05a3, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:250:0x05b5, code lost: r6.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r7, com.discord.api.message.reaction.MessageReactionUpdate.class); */ - /* JADX WARNING: Code restructure failed: missing block: B:271:?, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:274:?, code lost: return; */ - /* JADX WARNING: Code restructure failed: missing block: B:272:?, code lost: - return; - */ - /* JADX WARNING: Code restructure failed: missing block: B:279:?, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:275:?, code lost: return; */ /* JADX WARNING: Code restructure failed: missing block: B:282:?, code lost: return; */ - /* JADX WARNING: Code restructure failed: missing block: B:283:?, code lost: - return; - */ /* JADX WARNING: Code restructure failed: missing block: B:285:?, code lost: return; */ /* JADX WARNING: Code restructure failed: missing block: B:286:?, code lost: return; */ - /* JADX WARNING: Code restructure failed: missing block: B:290:?, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:288:?, code lost: return; */ - /* JADX WARNING: Code restructure failed: missing block: B:294:?, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:289:?, code lost: return; */ - /* JADX WARNING: Code restructure failed: missing block: B:295:?, code lost: - return; - */ - /* JADX WARNING: Code restructure failed: missing block: B:296:?, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:293:?, code lost: return; */ /* JADX WARNING: Code restructure failed: missing block: B:297:?, code lost: return; */ - /* JADX WARNING: Code restructure failed: missing block: B:304:?, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:298:?, code lost: return; */ - /* JADX WARNING: Code restructure failed: missing block: B:310:?, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:299:?, code lost: return; */ - /* JADX WARNING: Code restructure failed: missing block: B:311:?, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:300:?, code lost: + return; + */ + /* JADX WARNING: Code restructure failed: missing block: B:308:?, code lost: + return; + */ + /* JADX WARNING: Code restructure failed: missing block: B:314:?, code lost: + return; + */ + /* JADX WARNING: Code restructure failed: missing block: B:315:?, code lost: return; */ /* JADX WARNING: Code restructure failed: missing block: B:50:0x0103, code lost: @@ -257,7 +258,7 @@ public final class IncomingParser implements Model { if (r3.equals("MESSAGE_UPDATE") != false) goto L_0x0226; */ /* JADX WARNING: Code restructure failed: missing block: B:76:0x0198, code lost: - if (r3.equals("USER_CONNECTIONS_UPDATE") != false) goto L_0x052c; + if (r3.equals("USER_CONNECTIONS_UPDATE") != false) goto L_0x053e; */ /* JADX WARNING: Code restructure failed: missing block: B:84:0x01c9, code lost: if (r3.equals("THREAD_DELETE") != false) goto L_0x01f8; @@ -269,7 +270,7 @@ public final class IncomingParser implements Model { r6.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r7, com.discord.api.channel.Channel.class); */ /* JADX WARNING: Code restructure failed: missing block: B:95:0x0206, code lost: - if (r3.equals("MESSAGE_REACTION_REMOVE") != false) goto L_0x05a3; + if (r3.equals("MESSAGE_REACTION_REMOVE") != false) goto L_0x05b5; */ /* JADX WARNING: Code restructure failed: missing block: B:97:0x0210, code lost: if (r3.equals("CHANNEL_RECIPIENT_ADD") != false) goto L_0x038c; @@ -356,6 +357,12 @@ public final class IncomingParser implements Model { return; } break; + case -1580624828: + if (str.equals("EMBEDDED_ACTIVITY_UPDATE")) { + this.data = InboundGatewayGsonParser.fromJson(jsonReader, EmbeddedActivityInboundUpdate.class); + return; + } + break; case -1553569310: break; case -1553064252: diff --git a/app/src/main/java/com/discord/models/embeddedactivities/EmbeddedActivity.java b/app/src/main/java/com/discord/models/embeddedactivities/EmbeddedActivity.java new file mode 100644 index 0000000000..43a6fffa46 --- /dev/null +++ b/app/src/main/java/com/discord/models/embeddedactivities/EmbeddedActivity.java @@ -0,0 +1,247 @@ +package com.discord.models.embeddedactivities; + +import a0.a.a.b; +import c.d.b.a.a; +import com.discord.api.activity.ActivityAssets; +import com.discord.api.activity.ActivitySecrets; +import com.discord.api.activity.ActivityTimestamps; +import com.discord.api.activity.ActivityType; +import d0.z.d.m; +import java.util.List; +import kotlin.jvm.internal.DefaultConstructorMarker; +/* compiled from: EmbeddedActivity.kt */ +public final class EmbeddedActivity { + public static final Companion Companion = new Companion(null); + private final long applicationId; + private final ActivityAssets assets; + private final Long createdAt; + private final String details; + private final long guildId; + private final String name; + private final ActivitySecrets secrets; + private final String state; + private final ActivityTimestamps timestamps; + private final ActivityType type; + private final String url; + private final List userIds; + + /* compiled from: EmbeddedActivity.kt */ + public static final class Companion { + private Companion() { + } + + public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) { + this(); + } + + public final EmbeddedActivity fromApiEmbeddedActivity(com.discord.api.embeddedactivities.EmbeddedActivity embeddedActivity, List list, String str, long j) { + m.checkNotNullParameter(embeddedActivity, "apiEmbeddedActivity"); + m.checkNotNullParameter(list, "userIds"); + m.checkNotNullParameter(str, "url"); + long a = embeddedActivity.a(); + ActivityAssets b = embeddedActivity.b(); + Long c2 = embeddedActivity.c(); + String d = embeddedActivity.d(); + String e = embeddedActivity.e(); + ActivitySecrets f = embeddedActivity.f(); + String g = embeddedActivity.g(); + ActivityTimestamps h = embeddedActivity.h(); + ActivityType i = embeddedActivity.i(); + if (i == null) { + i = ActivityType.UNKNOWN; + } + return new EmbeddedActivity(a, b, c2, d, e, f, g, h, i, list, str, j); + } + } + + public EmbeddedActivity(long j, ActivityAssets activityAssets, Long l, String str, String str2, ActivitySecrets activitySecrets, String str3, ActivityTimestamps activityTimestamps, ActivityType activityType, List list, String str4, long j2) { + m.checkNotNullParameter(activityType, "type"); + m.checkNotNullParameter(list, "userIds"); + m.checkNotNullParameter(str4, "url"); + this.applicationId = j; + this.assets = activityAssets; + this.createdAt = l; + this.details = str; + this.name = str2; + this.secrets = activitySecrets; + this.state = str3; + this.timestamps = activityTimestamps; + this.type = activityType; + this.userIds = list; + this.url = str4; + this.guildId = j2; + } + + public static /* synthetic */ EmbeddedActivity copy$default(EmbeddedActivity embeddedActivity, long j, ActivityAssets activityAssets, Long l, String str, String str2, ActivitySecrets activitySecrets, String str3, ActivityTimestamps activityTimestamps, ActivityType activityType, List list, String str4, long j2, int i, Object obj) { + return embeddedActivity.copy((i & 1) != 0 ? embeddedActivity.applicationId : j, (i & 2) != 0 ? embeddedActivity.assets : activityAssets, (i & 4) != 0 ? embeddedActivity.createdAt : l, (i & 8) != 0 ? embeddedActivity.details : str, (i & 16) != 0 ? embeddedActivity.name : str2, (i & 32) != 0 ? embeddedActivity.secrets : activitySecrets, (i & 64) != 0 ? embeddedActivity.state : str3, (i & 128) != 0 ? embeddedActivity.timestamps : activityTimestamps, (i & 256) != 0 ? embeddedActivity.type : activityType, (i & 512) != 0 ? embeddedActivity.userIds : list, (i & 1024) != 0 ? embeddedActivity.url : str4, (i & 2048) != 0 ? embeddedActivity.guildId : j2); + } + + public final long component1() { + return this.applicationId; + } + + public final List component10() { + return this.userIds; + } + + public final String component11() { + return this.url; + } + + public final long component12() { + return this.guildId; + } + + public final ActivityAssets component2() { + return this.assets; + } + + public final Long component3() { + return this.createdAt; + } + + public final String component4() { + return this.details; + } + + public final String component5() { + return this.name; + } + + public final ActivitySecrets component6() { + return this.secrets; + } + + public final String component7() { + return this.state; + } + + public final ActivityTimestamps component8() { + return this.timestamps; + } + + public final ActivityType component9() { + return this.type; + } + + public final EmbeddedActivity copy(long j, ActivityAssets activityAssets, Long l, String str, String str2, ActivitySecrets activitySecrets, String str3, ActivityTimestamps activityTimestamps, ActivityType activityType, List list, String str4, long j2) { + m.checkNotNullParameter(activityType, "type"); + m.checkNotNullParameter(list, "userIds"); + m.checkNotNullParameter(str4, "url"); + return new EmbeddedActivity(j, activityAssets, l, str, str2, activitySecrets, str3, activityTimestamps, activityType, list, str4, j2); + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof EmbeddedActivity)) { + return false; + } + EmbeddedActivity embeddedActivity = (EmbeddedActivity) obj; + return this.applicationId == embeddedActivity.applicationId && m.areEqual(this.assets, embeddedActivity.assets) && m.areEqual(this.createdAt, embeddedActivity.createdAt) && m.areEqual(this.details, embeddedActivity.details) && m.areEqual(this.name, embeddedActivity.name) && m.areEqual(this.secrets, embeddedActivity.secrets) && m.areEqual(this.state, embeddedActivity.state) && m.areEqual(this.timestamps, embeddedActivity.timestamps) && m.areEqual(this.type, embeddedActivity.type) && m.areEqual(this.userIds, embeddedActivity.userIds) && m.areEqual(this.url, embeddedActivity.url) && this.guildId == embeddedActivity.guildId; + } + + public final long getApplicationId() { + return this.applicationId; + } + + public final ActivityAssets getAssets() { + return this.assets; + } + + public final Long getCreatedAt() { + return this.createdAt; + } + + public final String getDetails() { + return this.details; + } + + public final long getGuildId() { + return this.guildId; + } + + public final String getName() { + return this.name; + } + + public final ActivitySecrets getSecrets() { + return this.secrets; + } + + public final String getState() { + return this.state; + } + + public final ActivityTimestamps getTimestamps() { + return this.timestamps; + } + + public final ActivityType getType() { + return this.type; + } + + public final String getUrl() { + return this.url; + } + + public final List getUserIds() { + return this.userIds; + } + + public int hashCode() { + int a = b.a(this.applicationId) * 31; + ActivityAssets activityAssets = this.assets; + int i = 0; + int hashCode = (a + (activityAssets != null ? activityAssets.hashCode() : 0)) * 31; + Long l = this.createdAt; + int hashCode2 = (hashCode + (l != null ? l.hashCode() : 0)) * 31; + String str = this.details; + int hashCode3 = (hashCode2 + (str != null ? str.hashCode() : 0)) * 31; + String str2 = this.name; + int hashCode4 = (hashCode3 + (str2 != null ? str2.hashCode() : 0)) * 31; + ActivitySecrets activitySecrets = this.secrets; + int hashCode5 = (hashCode4 + (activitySecrets != null ? activitySecrets.hashCode() : 0)) * 31; + String str3 = this.state; + int hashCode6 = (hashCode5 + (str3 != null ? str3.hashCode() : 0)) * 31; + ActivityTimestamps activityTimestamps = this.timestamps; + int hashCode7 = (hashCode6 + (activityTimestamps != null ? activityTimestamps.hashCode() : 0)) * 31; + ActivityType activityType = this.type; + int hashCode8 = (hashCode7 + (activityType != null ? activityType.hashCode() : 0)) * 31; + List list = this.userIds; + int hashCode9 = (hashCode8 + (list != null ? list.hashCode() : 0)) * 31; + String str4 = this.url; + if (str4 != null) { + i = str4.hashCode(); + } + return b.a(this.guildId) + ((hashCode9 + i) * 31); + } + + public String toString() { + StringBuilder R = a.R("EmbeddedActivity(applicationId="); + R.append(this.applicationId); + R.append(", assets="); + R.append(this.assets); + R.append(", createdAt="); + R.append(this.createdAt); + R.append(", details="); + R.append(this.details); + R.append(", name="); + R.append(this.name); + R.append(", secrets="); + R.append(this.secrets); + R.append(", state="); + R.append(this.state); + R.append(", timestamps="); + R.append(this.timestamps); + R.append(", type="); + R.append(this.type); + R.append(", userIds="); + R.append(this.userIds); + R.append(", url="); + R.append(this.url); + R.append(", guildId="); + return a.B(R, this.guildId, ")"); + } +} 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 1b99f6ca8d..303ad804cd 100644 --- a/app/src/main/java/com/discord/models/guild/Guild.java +++ b/app/src/main/java/com/discord/models/guild/Guild.java @@ -66,42 +66,42 @@ public final class Guild { /* 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.N(), guild.d(), guild.w(), 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.O(), guild.d(), guild.x(), 4, 0, null); m.checkNotNullParameter(guild, "apiGuild"); - List E = guild.E(); - E = E == null ? n.emptyList() : E; - List j = guild.j(); - j = j == null ? n.emptyList() : j; - String v = guild.v(); + List F = guild.F(); + F = F == null ? n.emptyList() : F; + List k = guild.k(); + k = k == null ? n.emptyList() : k; + String w = guild.w(); String i = guild.i(); Integer h = guild.h(); int intValue = h != null ? h.intValue() : ModelNotificationSettings.FREQUENCY_ALL; - long p = guild.p(); - String D = guild.D(); - long x2 = guild.x(); - String o = guild.o(); - GuildVerificationLevel O = guild.O(); - O = O == null ? GuildVerificationLevel.NONE : O; - GuildExplicitContentFilter k = guild.k(); - k = k == null ? GuildExplicitContentFilter.NONE : k; - boolean M = guild.M(); - int u = guild.u(); + 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; + GuildExplicitContentFilter l = guild.l(); + l = l == null ? GuildExplicitContentFilter.NONE : l; + boolean N = guild.N(); + int v = guild.v(); int c2 = guild.c(); Long b = guild.b(); - Long K = guild.K(); - Set set = u.toSet(guild.l()); - int s2 = guild.s(); + Long L = guild.L(); + Set set = u.toSet(guild.m()); + int t = guild.t(); String e = guild.e(); - String G = guild.G(); + String H = guild.H(); + int B = guild.B(); int A = guild.A(); - int z2 = guild.z(); - int J = guild.J(); - String q = guild.q(); - Long F = guild.F(); - Long C = guild.C(); - String y2 = guild.y(); - GuildWelcomeScreen Q = guild.Q(); - GuildMaxVideoChannelUsers r = guild.r(); + 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(); } /* JADX DEBUG: Multi-variable search result rejected for r30v0, resolved type: java.util.Set */ @@ -547,78 +547,78 @@ public final class Guild { public final Guild merge(com.discord.api.guild.Guild guild) { m.checkNotNullParameter(guild, "apiGuild"); List emptyList = n.emptyList(); - List j = guild.j(); - if (j == null) { - j = n.emptyList(); + List k = guild.k(); + if (k == null) { + k = n.emptyList(); } - String v = guild.v(); + String w = guild.w(); String i = guild.i(); if (i == null) { i = this.description; } Integer h = guild.h(); int intValue = h != null ? h.intValue() : this.defaultMessageNotifications; - long p = guild.p() != 0 ? guild.p() : this.f2169id; - String D = guild.D(); - if (D == null) { - D = this.region; + long q = guild.q() != 0 ? guild.q() : this.f2169id; + String E = guild.E(); + if (E == null) { + E = this.region; } - long x2 = guild.x() != 0 ? guild.x() : this.ownerId; - String o = guild.o(); - if (o == null) { - o = this.icon; + long y2 = guild.y() != 0 ? guild.y() : this.ownerId; + String p = guild.p(); + if (p == null) { + p = this.icon; } - GuildVerificationLevel O = guild.O(); - if (O == null) { - O = this.verificationLevel; + GuildVerificationLevel P = guild.P(); + if (P == null) { + P = this.verificationLevel; } - GuildExplicitContentFilter k = guild.k(); - if (k == null) { - k = this.explicitContentFilter; + GuildExplicitContentFilter l = guild.l(); + if (l == null) { + l = this.explicitContentFilter; } - boolean M = guild.M(); - int u = guild.u(); + boolean N = guild.N(); + int v = guild.v(); int c2 = guild.c() != 0 ? guild.c() : this.afkTimeout; Long b = guild.b(); - Long K = guild.K(); - Set set = u.toSet(guild.l()); + Long L = guild.L(); + Set set = u.toSet(guild.m()); String e = guild.e(); - String G = guild.G(); - if (G == null) { - G = this.splash; + String H = guild.H(); + if (H == null) { + H = this.splash; } + int B = guild.B(); int A = guild.A(); - int z2 = guild.z(); - int J = guild.J(); - String q = guild.q(); - if (q == null) { - q = this.joinedAt; - } - Long F = guild.F(); - if (F == null) { - F = this.rulesChannelId; - } - Long C = guild.C(); - if (C == null) { - C = this.publicUpdatesChannelId; - } - String y2 = guild.y(); - if (y2 == null) { - y2 = this.preferredLocale; - } - GuildWelcomeScreen Q = guild.Q(); - if (Q == null) { - Q = this.welcomeScreen; - } - GuildMaxVideoChannelUsers r = guild.r(); + int K = guild.K(); + String r = guild.r(); if (r == null) { - r = this.maxVideoChannelUsers; + r = this.joinedAt; } - String N = guild.N(); - if (N == null) { - N = this.vanityUrlCode; + Long G = guild.G(); + if (G == null) { + G = this.rulesChannelId; } - return new Guild(emptyList, j, null, v, i, intValue, p, D, x2, o, O, k, M, u, c2, b, K, set, 0, e, G, A, z2, J, q, F, C, y2, Q, r, N, guild.d() != 0 ? guild.d() : this.approximatePresenceCount, guild.w(), 4, 0, null); + 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(); + if (s2 == null) { + s2 = this.maxVideoChannelUsers; + } + String O = guild.O(); + if (O == null) { + O = this.vanityUrlCode; + } + 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); } public String toString() { diff --git a/app/src/main/java/com/discord/restapi/RestAPIInterface.java b/app/src/main/java/com/discord/restapi/RestAPIInterface.java index b1029ac479..6fcab6f206 100644 --- a/app/src/main/java/com/discord/restapi/RestAPIInterface.java +++ b/app/src/main/java/com/discord/restapi/RestAPIInterface.java @@ -838,6 +838,10 @@ public interface RestAPIInterface { @f("channels/{channelId}/directory-entries/search") Observable> searchServers(@s("channelId") long j, @t("query") String str); + @i0.f0.o("interactions") + @l + Observable sendApplicationCommand(@q("payload_json") PayloadJSON payloadJSON, @q MultipartBody.Part[] partArr); + @i0.f0.o("interactions") Observable sendApplicationCommand(@a RestAPIParams.ApplicationCommand applicationCommand); diff --git a/app/src/main/java/com/discord/stores/ReadyPayloadUtils.java b/app/src/main/java/com/discord/stores/ReadyPayloadUtils.java index 4cf6ae8755..f2074ea1e0 100644 --- a/app/src/main/java/com/discord/stores/ReadyPayloadUtils.java +++ b/app/src/main/java/com/discord/stores/ReadyPayloadUtils.java @@ -371,26 +371,26 @@ public final class ReadyPayloadUtils { String e = guild2.e(); Integer h = guild2.h(); String i = guild2.i(); - GuildExplicitContentFilter k = guild2.k(); - List l = guild2.l(); - String o = guild2.o(); - GuildMaxVideoChannelUsers r = guild2.r(); - int u = guild2.u(); - String v = guild2.v(); - long x2 = guild2.x(); - String y2 = guild2.y(); - int A = guild2.A(); - Long C = guild2.C(); - String D = guild2.D(); - Long F = guild2.F(); - guild3 = Guild.a(guild, null, null, null, v, i, h, 0, D, x2, o, guild2.O(), k, null, null, null, null, false, u, c2, b, guild2.K(), l, 0, e, guild2.G(), A, 0, guild2.J(), null, F, C, y2, null, r, guild2.N(), 0, 0, null, null, null, null, false, null, null, 339865671, 4089); + 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); } 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, -3, 4095); + 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); } 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, -5, 4095); + 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); } 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, -1, 3967); + 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); } 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, -8193, 4095); + 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); } 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, -2, 4095); + 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); } 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, -4097, 4095); + 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); } - 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, -16385, 4095) : 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, -16385, 8191) : guild7; } /* JADX WARNING: Removed duplicated region for block: B:37:0x00a5 */ @@ -438,17 +438,17 @@ public final class ReadyPayloadUtils { List list4; List list5; m.checkNotNullParameter(guild, "guild"); - GuildHashes m = guild.m(); - if (m == null || !GuildHashUtilsKt.isSupported(m)) { + GuildHashes n = guild.n(); + if (n == null || !GuildHashUtilsKt.isSupported(n)) { Boolean bool = Boolean.FALSE; triple = new Triple(bool, bool, bool); } else { - GuildHash b = m.b(); + GuildHash b = n.b(); boolean z2 = false; Boolean valueOf = Boolean.valueOf(b != null ? b.b() : false); - GuildHash a = m.a(); + GuildHash a = n.a(); Boolean valueOf2 = Boolean.valueOf(a != null ? a.b() : false); - GuildHash c2 = m.c(); + GuildHash c2 = n.c(); if (c2 != null) { z2 = c2.b(); } @@ -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.M()) { + if (guild.N()) { return new HydrateGuildResult.Success(guild); } - GuildCache remove = cache.remove(Long.valueOf(guild.p())); + GuildCache remove = cache.remove(Long.valueOf(guild.q())); 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 eacccbe271..74878ee7e1 100644 --- a/app/src/main/java/com/discord/stores/StoreAnalytics.java +++ b/app/src/main/java/com/discord/stores/StoreAnalytics.java @@ -671,7 +671,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.p())); + pairArr[2] = o.to("invite_guild_id", (modelInvite == null || (guild = modelInvite.getGuild()) == null) ? null : Long.valueOf(guild.q())); 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/StoreApplicationInteractions$resendApplicationCommand$1.java b/app/src/main/java/com/discord/stores/StoreApplicationInteractions$resendApplicationCommand$1.java index dd25d500b8..8b9124e58f 100644 --- a/app/src/main/java/com/discord/stores/StoreApplicationInteractions$resendApplicationCommand$1.java +++ b/app/src/main/java/com/discord/stores/StoreApplicationInteractions$resendApplicationCommand$1.java @@ -25,7 +25,7 @@ public final class StoreApplicationInteractions$resendApplicationCommand$1 exten /* renamed from: invoke */ public final void mo1invoke() { StoreApplicationInteractions.access$getStoreMessages$p(this.this$0).deleteLocalMessage(this.$message.getChannelId(), this.$nonce); - StoreApplicationInteractions.handleSendApplicationCommandRequest$default(this.this$0, this.$updatedSendData, null, null, 6, null); + StoreApplicationInteractions.handleSendApplicationCommandRequest$default(this.this$0, this.$updatedSendData, null, null, null, 14, null); StoreApplicationInteractions.access$removeApplicationCommandSendData(this.this$0, this.$nonce); } } diff --git a/app/src/main/java/com/discord/stores/StoreApplicationInteractions$sendApplicationCommand$1.java b/app/src/main/java/com/discord/stores/StoreApplicationInteractions$sendApplicationCommand$1.java index d30cc9a4be..479dfeebe6 100644 --- a/app/src/main/java/com/discord/stores/StoreApplicationInteractions$sendApplicationCommand$1.java +++ b/app/src/main/java/com/discord/stores/StoreApplicationInteractions$sendApplicationCommand$1.java @@ -2,21 +2,24 @@ package com.discord.stores; import com.discord.models.commands.ApplicationCommandLocalSendData; import d0.z.d.o; +import java.util.List; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; /* compiled from: StoreApplicationInteractions.kt */ public final class StoreApplicationInteractions$sendApplicationCommand$1 extends o implements Function0 { + public final /* synthetic */ List $attachments; public final /* synthetic */ ApplicationCommandLocalSendData $localSendData; public final /* synthetic */ Function1 $onFail; public final /* synthetic */ Function0 $onSuccess; public final /* synthetic */ StoreApplicationInteractions this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreApplicationInteractions$sendApplicationCommand$1(StoreApplicationInteractions storeApplicationInteractions, ApplicationCommandLocalSendData applicationCommandLocalSendData, Function0 function0, Function1 function1) { + public StoreApplicationInteractions$sendApplicationCommand$1(StoreApplicationInteractions storeApplicationInteractions, ApplicationCommandLocalSendData applicationCommandLocalSendData, List list, Function0 function0, Function1 function1) { super(0); this.this$0 = storeApplicationInteractions; this.$localSendData = applicationCommandLocalSendData; + this.$attachments = list; this.$onSuccess = function0; this.$onFail = function1; } @@ -24,6 +27,6 @@ public final class StoreApplicationInteractions$sendApplicationCommand$1 extends @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - StoreApplicationInteractions.access$handleSendApplicationCommandRequest(this.this$0, this.$localSendData, this.$onSuccess, this.$onFail); + StoreApplicationInteractions.access$handleSendApplicationCommandRequest(this.this$0, this.$localSendData, this.$attachments, this.$onSuccess, this.$onFail); } } diff --git a/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java b/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java index e79c35cced..8ff4471bd0 100644 --- a/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java +++ b/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java @@ -29,6 +29,7 @@ import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.time.Clock; import com.discord.utilities.user.UserUtils; import com.google.gson.Gson; +import com.lytefast.flexinput.model.Attachment; import d0.g0.t; import d0.o; import d0.t.g0; @@ -359,8 +360,8 @@ public final class StoreApplicationInteractions extends StoreV2 { storeApplicationInteractions.handleInteractionDataFetchSuccess(j, applicationCommandData); } - public static final /* synthetic */ void access$handleSendApplicationCommandRequest(StoreApplicationInteractions storeApplicationInteractions, ApplicationCommandLocalSendData applicationCommandLocalSendData, Function0 function0, Function1 function1) { - storeApplicationInteractions.handleSendApplicationCommandRequest(applicationCommandLocalSendData, function0, function1); + public static final /* synthetic */ void access$handleSendApplicationCommandRequest(StoreApplicationInteractions storeApplicationInteractions, ApplicationCommandLocalSendData applicationCommandLocalSendData, List list, Function0 function0, Function1 function1) { + storeApplicationInteractions.handleSendApplicationCommandRequest(applicationCommandLocalSendData, list, function0, function1); } public static final /* synthetic */ void access$removeApplicationCommandSendData(StoreApplicationInteractions storeApplicationInteractions, String str) { @@ -483,21 +484,24 @@ public final class StoreApplicationInteractions extends StoreV2 { } @StoreThread - private final void handleSendApplicationCommandRequest(ApplicationCommandLocalSendData applicationCommandLocalSendData, Function0 function0, Function1 function1) { + private final void handleSendApplicationCommandRequest(ApplicationCommandLocalSendData applicationCommandLocalSendData, List> list, Function0 function0, Function1 function1) { upsertApplicationCommandSendData(applicationCommandLocalSendData); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(sendApplicationCommandObservable(applicationCommandLocalSendData), false, 1, null), StoreApplicationInteractions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreApplicationInteractions$handleSendApplicationCommandRequest$1(this, applicationCommandLocalSendData, function0, function1), 62, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(sendApplicationCommandObservable(applicationCommandLocalSendData, list), false, 1, null), StoreApplicationInteractions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreApplicationInteractions$handleSendApplicationCommandRequest$1(this, applicationCommandLocalSendData, function0, function1), 62, (Object) null); } /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: com.discord.stores.StoreApplicationInteractions */ /* JADX WARN: Multi-variable type inference failed */ - public static /* synthetic */ void handleSendApplicationCommandRequest$default(StoreApplicationInteractions storeApplicationInteractions, ApplicationCommandLocalSendData applicationCommandLocalSendData, Function0 function0, Function1 function1, int i, Object obj) { + public static /* synthetic */ void handleSendApplicationCommandRequest$default(StoreApplicationInteractions storeApplicationInteractions, ApplicationCommandLocalSendData applicationCommandLocalSendData, List list, Function0 function0, Function1 function1, int i, Object obj) { if ((i & 2) != 0) { - function0 = null; + list = null; } if ((i & 4) != 0) { + function0 = null; + } + if ((i & 8) != 0) { function1 = null; } - storeApplicationInteractions.handleSendApplicationCommandRequest(applicationCommandLocalSendData, function0, function1); + storeApplicationInteractions.handleSendApplicationCommandRequest(applicationCommandLocalSendData, list, function0, function1); } /* JADX WARNING: Removed duplicated region for block: B:10:0x001d A[Catch:{ Exception -> 0x0036 }] */ @@ -548,8 +552,21 @@ public final class StoreApplicationInteractions extends StoreV2 { } } - private final Observable sendApplicationCommandObservable(ApplicationCommandLocalSendData applicationCommandLocalSendData) { - return this.storeMessages.sendMessage(buildApplicationCommandLocalMessage$default(this, applicationCommandLocalSendData, false, false, 6, null), applicationCommandLocalSendData); + public static /* synthetic */ void sendApplicationCommand$default(StoreApplicationInteractions storeApplicationInteractions, long j, Long l, String str, com.discord.widgets.chat.input.models.ApplicationCommandData applicationCommandData, List list, Function0 function0, Function1 function1, int i, Object obj) { + storeApplicationInteractions.sendApplicationCommand(j, l, str, applicationCommandData, (i & 16) != 0 ? null : list, function0, function1); + } + + private final Observable sendApplicationCommandObservable(ApplicationCommandLocalSendData applicationCommandLocalSendData, List> list) { + return this.storeMessages.sendMessage(buildApplicationCommandLocalMessage$default(this, applicationCommandLocalSendData, false, false, 6, null), applicationCommandLocalSendData, list); + } + + /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.stores.StoreApplicationInteractions */ + /* JADX WARN: Multi-variable type inference failed */ + public static /* synthetic */ Observable sendApplicationCommandObservable$default(StoreApplicationInteractions storeApplicationInteractions, ApplicationCommandLocalSendData applicationCommandLocalSendData, List list, int i, Object obj) { + if ((i & 2) != 0) { + list = null; + } + return storeApplicationInteractions.sendApplicationCommandObservable(applicationCommandLocalSendData, list); } private final User toUser(Application application) { @@ -796,11 +813,11 @@ public final class StoreApplicationInteractions extends StoreV2 { } } - public final void sendApplicationCommand(long j, Long l, String str, com.discord.widgets.chat.input.models.ApplicationCommandData applicationCommandData, Function0 function0, Function1 function1) { + public final void sendApplicationCommand(long j, Long l, String str, com.discord.widgets.chat.input.models.ApplicationCommandData applicationCommandData, List> list, Function0 function0, Function1 function1) { m.checkNotNullParameter(applicationCommandData, "data"); m.checkNotNullParameter(function0, "onSuccess"); m.checkNotNullParameter(function1, "onFail"); - this.dispatcher.schedule(new StoreApplicationInteractions$sendApplicationCommand$1(this, new ApplicationCommandLocalSendData(this.nonceGenerator.nonce(), j, l, applicationCommandData.getApplicationCommand().getGuildId(), applicationCommandData.getApplication(), applicationCommandData.getApplicationCommand().getName(), applicationCommandData.getApplicationCommand().getId(), applicationCommandData.getValues(), str, null, 512, null), function0, function1)); + this.dispatcher.schedule(new StoreApplicationInteractions$sendApplicationCommand$1(this, new ApplicationCommandLocalSendData(this.nonceGenerator.nonce(), j, l, applicationCommandData.getApplicationCommand().getGuildId(), applicationCommandData.getApplication(), applicationCommandData.getApplicationCommand().getName(), applicationCommandData.getApplicationCommand().getId(), applicationCommandData.getValues(), str, null, 512, null), list, function0, function1)); } public final void sendComponentInteraction(long j, Long l, long j2, long j3, int i, RestAPIParams.ComponentInteractionData componentInteractionData, Long l2) { diff --git a/app/src/main/java/com/discord/stores/StoreApplicationStreaming.java b/app/src/main/java/com/discord/stores/StoreApplicationStreaming.java index ad8f07f266..bde1637789 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 P = guild.P(); - if (P != null) { - for (VoiceState voiceState : P) { - handleVoiceStateUpdate(voiceState, guild.p()); + List Q = guild.Q(); + if (Q != null) { + for (VoiceState voiceState : Q) { + handleVoiceStateUpdate(voiceState, guild.q()); } } } 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 2305e96243..816c9fc958 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.p(); + return channel.f() == this.$guild.q(); } } diff --git a/app/src/main/java/com/discord/stores/StoreChannels.java b/app/src/main/java/com/discord/stores/StoreChannels.java index 7fd3862384..1a1278d0b6 100644 --- a/app/src/main/java/com/discord/stores/StoreChannels.java +++ b/app/src/main/java/com/discord/stores/StoreChannels.java @@ -383,7 +383,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.p()); + Long valueOf2 = Long.valueOf(guild.q()); Map map5 = map4.get(valueOf2); if (map5 == null) { map5 = new HashMap<>(); @@ -393,14 +393,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.p(), 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.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)); } } - List L = guild.L(); - if (L != null) { - for (Channel channel4 : L) { + List M = guild.M(); + if (M != null) { + for (Channel channel4 : M) { if (ChannelUtils.C(channel4)) { - storeThread$app_productionCanaryRelease$default(this, channel4, guild.p(), null, 4, null); + storeThread$app_productionCanaryRelease$default(this, channel4, guild.q(), null, 4, null); } } } @@ -495,7 +495,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.p()); + Long valueOf = Long.valueOf(guild.q()); Map map2 = map.get(valueOf); if (map2 == null) { map2 = new HashMap<>(); @@ -505,15 +505,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.p(), 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.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)); this.channelNames.put(Long.valueOf(channel.h()), ChannelUtils.c(channel)); } } - List L = guild.L(); - if (L != null) { - for (Channel channel2 : L) { + List M = guild.M(); + if (M != null) { + for (Channel channel2 : M) { if (ChannelUtils.C(channel2)) { - storeThread$app_productionCanaryRelease$default(this, channel2, guild.p(), null, 4, null); + storeThread$app_productionCanaryRelease$default(this, channel2, guild.q(), null, 4, null); } } } @@ -524,15 +524,15 @@ public final class StoreChannels extends StoreV2 { public final void handleGuildRemove(Guild guild) { Set keySet; m.checkNotNullParameter(guild, "guild"); - long p = guild.p(); - if (this.channelsByGuild.containsKey(Long.valueOf(p))) { - Map map = this.channelsByGuild.get(Long.valueOf(p)); + long q = guild.q(); + if (this.channelsByGuild.containsKey(Long.valueOf(q))) { + Map map = this.channelsByGuild.get(Long.valueOf(q)); if (!(map == null || (keySet = map.keySet()) == null)) { for (Number number : keySet) { this.channelNames.remove(Long.valueOf(number.longValue())); } } - this.channelsByGuild.remove(Long.valueOf(guild.p())); + this.channelsByGuild.remove(Long.valueOf(guild.q())); 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 d330f9e3dd..c04a27a8a0 100644 --- a/app/src/main/java/com/discord/stores/StoreChannelsSelected.java +++ b/app/src/main/java/com/discord/stores/StoreChannelsSelected.java @@ -683,7 +683,9 @@ public final class StoreChannelsSelected extends StoreV2 { @StoreThread private final void onSelectedChannelResolved(ResolvedSelectedChannel resolvedSelectedChannel) { - this.previouslySelectedChannel = this.selectedChannel; + if (this.selectedChannel.getId() != resolvedSelectedChannel.getId()) { + this.previouslySelectedChannel = this.selectedChannel; + } this.selectedChannel = resolvedSelectedChannel; boolean z2 = resolvedSelectedChannel instanceof ResolvedSelectedChannel.Channel; if (z2) { @@ -796,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.p())); + hashSetOf.add(Long.valueOf(guild.q())); } Map map = this.userChannelSelections; LinkedHashMap linkedHashMap = new LinkedHashMap(); @@ -818,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.p()) { + if (this.storeGuildSelected.getSelectedGuildIdInternal$app_productionCanaryRelease() == guild.q()) { validateSelectedChannel(); } } @@ -827,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.p()) { + if (maybeChannel != null && maybeChannel.f() == guild.q()) { validateSelectedChannel(); } } diff --git a/app/src/main/java/com/discord/stores/StoreClientDataState.java b/app/src/main/java/com/discord/stores/StoreClientDataState.java index adae36f56b..b2373373fe 100644 --- a/app/src/main/java/com/discord/stores/StoreClientDataState.java +++ b/app/src/main/java/com/discord/stores/StoreClientDataState.java @@ -206,16 +206,16 @@ public final class StoreClientDataState extends StoreV2 { @StoreThread private final void updateGuildHash(Guild guild) { - GuildHashes m; - if (guild.M() || (m = guild.m()) == null || !GuildHashUtilsKt.isSupported(m)) { - this.guildHashes.remove(Long.valueOf(guild.p())); + GuildHashes n; + if (guild.N() || (n = guild.n()) == null || !GuildHashUtilsKt.isSupported(n)) { + this.guildHashes.remove(Long.valueOf(guild.q())); return; } Map map = this.guildHashes; - Long valueOf = Long.valueOf(guild.p()); - GuildHashes m2 = guild.m(); - m.checkNotNull(m2); - map.put(valueOf, m2); + Long valueOf = Long.valueOf(guild.q()); + GuildHashes n2 = guild.n(); + m.checkNotNull(n2); + map.put(valueOf, n2); } @StoreThread @@ -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.p())); + this.guildHashes.remove(Long.valueOf(guild.q())); markChanged(); } diff --git a/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java b/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java index eb40682361..35553c7f07 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.p())); + Set set = this.collapsedCategories.get(Long.valueOf(guild.q())); 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 p = guild.p(); + long q = guild.q(); m.checkNotNullExpressionValue(l, "channelId"); - setCollapsedState(p, l.longValue(), false); + setCollapsedState(q, l.longValue(), false); } - hashSet.remove(Long.valueOf(guild.p())); + hashSet.remove(Long.valueOf(guild.q())); } } for (Long l2 : hashSet) { diff --git a/app/src/main/java/com/discord/stores/StoreEmbeddedActivities$observeEmbeddedActivities$1.java b/app/src/main/java/com/discord/stores/StoreEmbeddedActivities$observeEmbeddedActivities$1.java new file mode 100644 index 0000000000..2e70365e9f --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreEmbeddedActivities$observeEmbeddedActivities$1.java @@ -0,0 +1,23 @@ +package com.discord.stores; + +import com.discord.models.embeddedactivities.EmbeddedActivity; +import d0.z.d.o; +import java.util.Map; +import kotlin.jvm.functions.Function0; +/* compiled from: StoreEmbeddedActivities.kt */ +public final class StoreEmbeddedActivities$observeEmbeddedActivities$1 extends o implements Function0>> { + public final /* synthetic */ StoreEmbeddedActivities this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreEmbeddedActivities$observeEmbeddedActivities$1(StoreEmbeddedActivities storeEmbeddedActivities) { + super(0); + this.this$0 = storeEmbeddedActivities; + } + + /* Return type fixed from 'java.util.Map>' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final Map> mo1invoke() { + return this.this$0.getEmbeddedActivities(); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreEmbeddedActivities$observeEmbeddedActivitiesForChannel$1.java b/app/src/main/java/com/discord/stores/StoreEmbeddedActivities$observeEmbeddedActivitiesForChannel$1.java new file mode 100644 index 0000000000..204f0870be --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreEmbeddedActivities$observeEmbeddedActivitiesForChannel$1.java @@ -0,0 +1,26 @@ +package com.discord.stores; + +import com.discord.models.embeddedactivities.EmbeddedActivity; +import d0.t.h0; +import j0.k.b; +import java.util.Map; +/* compiled from: StoreEmbeddedActivities.kt */ +public final class StoreEmbeddedActivities$observeEmbeddedActivitiesForChannel$1 implements b>, Map> { + public final /* synthetic */ long $channelId; + + public StoreEmbeddedActivities$observeEmbeddedActivitiesForChannel$1(long j) { + 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 // j0.k.b + public /* bridge */ /* synthetic */ Map call(Map> map) { + return call((Map>) map); + } + + public final Map call(Map> map) { + Map map2 = (Map) map.get(Long.valueOf(this.$channelId)); + return map2 != null ? map2 : h0.emptyMap(); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreEmbeddedActivities.java b/app/src/main/java/com/discord/stores/StoreEmbeddedActivities.java new file mode 100644 index 0000000000..ded500747e --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreEmbeddedActivities.java @@ -0,0 +1,125 @@ +package com.discord.stores; + +import com.discord.BuildConfig; +import com.discord.api.embeddedactivities.EmbeddedActivityInGuild; +import com.discord.api.embeddedactivities.EmbeddedActivityInboundUpdate; +import com.discord.api.guild.Guild; +import com.discord.models.domain.ModelPayload; +import com.discord.models.embeddedactivities.EmbeddedActivity; +import com.discord.stores.updates.ObservationDeck; +import com.discord.stores.updates.ObservationDeckProvider; +import d0.t.h0; +import d0.z.d.m; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import kotlin.jvm.internal.DefaultConstructorMarker; +import rx.Observable; +/* compiled from: StoreEmbeddedActivities.kt */ +public final class StoreEmbeddedActivities extends StoreV2 { + private final Map> embeddedActivitiesByChannel; + private Map> embeddedActivitiesByChannelSnapshot; + private final ObservationDeck observationDeck; + + public StoreEmbeddedActivities() { + this(null, 1, null); + } + + public StoreEmbeddedActivities(ObservationDeck observationDeck) { + m.checkNotNullParameter(observationDeck, "observationDeck"); + this.observationDeck = observationDeck; + this.embeddedActivitiesByChannelSnapshot = h0.emptyMap(); + this.embeddedActivitiesByChannel = new LinkedHashMap(); + } + + /* JADX INFO: this call moved to the top of the method (can break code semantics) */ + public /* synthetic */ StoreEmbeddedActivities(ObservationDeck observationDeck, int i, DefaultConstructorMarker defaultConstructorMarker) { + this((i & 1) != 0 ? ObservationDeckProvider.get() : observationDeck); + } + + private final String getUrlForApplication(long j) { + if (BuildConfig.EMBEDDED_ACTIVITY_APPLICATION_HOST.length() == 0) { + return null; + } + return "https://" + j + '.' + BuildConfig.EMBEDDED_ACTIVITY_APPLICATION_HOST; + } + + @StoreThread + private final void handleEmbeddedActivitiesForGuild(Guild guild) { + for (EmbeddedActivityInGuild embeddedActivityInGuild : guild.j()) { + handleEmbeddedActivityForChannel(embeddedActivityInGuild.a(), embeddedActivityInGuild.c(), embeddedActivityInGuild.b(), guild.q()); + } + } + + @StoreThread + private final void handleEmbeddedActivityForChannel(long j, List list, com.discord.api.embeddedactivities.EmbeddedActivity embeddedActivity, long j2) { + String urlForApplication = getUrlForApplication(embeddedActivity.a()); + if (urlForApplication != null) { + EmbeddedActivity fromApiEmbeddedActivity = EmbeddedActivity.Companion.fromApiEmbeddedActivity(embeddedActivity, list, urlForApplication, j2); + Map map = this.embeddedActivitiesByChannel.get(Long.valueOf(j)); + if (map == null) { + map = new LinkedHashMap<>(); + } + long applicationId = fromApiEmbeddedActivity.getApplicationId(); + if (!list.isEmpty()) { + map.put(Long.valueOf(applicationId), fromApiEmbeddedActivity); + } else { + map.remove(Long.valueOf(applicationId)); + } + this.embeddedActivitiesByChannel.put(Long.valueOf(j), map); + markChanged(); + } + } + + /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: java.util.Map>, java.util.Map> */ + public final Map> getEmbeddedActivities() { + return this.embeddedActivitiesByChannelSnapshot; + } + + @StoreThread + public final void handleConnectionOpen(ModelPayload modelPayload) { + m.checkNotNullParameter(modelPayload, "payload"); + this.embeddedActivitiesByChannel.clear(); + List guilds = modelPayload.getGuilds(); + m.checkNotNullExpressionValue(guilds, "payload.guilds"); + for (Guild guild : guilds) { + m.checkNotNullExpressionValue(guild, "guild"); + handleEmbeddedActivitiesForGuild(guild); + } + markChanged(); + } + + @StoreThread + public final void handleEmbeddedActivityInboundUpdate(EmbeddedActivityInboundUpdate embeddedActivityInboundUpdate) { + m.checkNotNullParameter(embeddedActivityInboundUpdate, "embeddedActivityInboundUpdate"); + handleEmbeddedActivityForChannel(embeddedActivityInboundUpdate.a(), embeddedActivityInboundUpdate.d(), embeddedActivityInboundUpdate.b(), embeddedActivityInboundUpdate.c()); + } + + @StoreThread + public final void handleGuildCreate(Guild guild) { + m.checkNotNullParameter(guild, "guild"); + handleEmbeddedActivitiesForGuild(guild); + } + + public final Observable>> observeEmbeddedActivities() { + return ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreEmbeddedActivities$observeEmbeddedActivities$1(this), 14, null); + } + + public final Observable> observeEmbeddedActivitiesForChannel(long j) { + Observable F = observeEmbeddedActivities().F(new StoreEmbeddedActivities$observeEmbeddedActivitiesForChannel$1(j)); + m.checkNotNullExpressionValue(F, "observeEmbeddedActivitie…] ?: emptyMap()\n }"); + return F; + } + + @Override // com.discord.stores.StoreV2 + @StoreThread + public void snapshotData() { + super.snapshotData(); + HashMap hashMap = new HashMap(); + for (Map.Entry> entry : this.embeddedActivitiesByChannel.entrySet()) { + hashMap.put(entry.getKey(), new HashMap(entry.getValue())); + } + this.embeddedActivitiesByChannelSnapshot = hashMap; + } +} diff --git a/app/src/main/java/com/discord/stores/StoreEmbeddedActivitiesKt.java b/app/src/main/java/com/discord/stores/StoreEmbeddedActivitiesKt.java new file mode 100644 index 0000000000..b1e5a4df52 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreEmbeddedActivitiesKt.java @@ -0,0 +1,4 @@ +package com.discord.stores; +/* compiled from: StoreEmbeddedActivities.kt */ +public final class StoreEmbeddedActivitiesKt { +} diff --git a/app/src/main/java/com/discord/stores/StoreEmojiCustom.java b/app/src/main/java/com/discord/stores/StoreEmojiCustom.java index 4cf6dea666..3fdd7ccfb8 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 t = guild.t(); - if (t == null) { + List u = guild.u(); + if (u == null) { return null; } - Iterator it = t.iterator(); + Iterator it = u.iterator(); while (true) { if (!it.hasNext()) { obj = null; @@ -181,18 +181,18 @@ public final class StoreEmojiCustom extends StoreV2 { if (guildMember == null) { return null; } - long p = guild.p(); - List j = guild.j(); - if (j != null) { - collection = new ArrayList<>(o.collectionSizeOrDefault(j, 10)); - for (GuildEmoji guildEmoji : j) { - collection.add(new ModelEmojiCustom(guildEmoji, p)); + long q = guild.q(); + List k = guild.k(); + if (k != null) { + collection = new ArrayList<>(o.collectionSizeOrDefault(k, 10)); + for (GuildEmoji guildEmoji : k) { + collection.add(new ModelEmojiCustom(guildEmoji, q)); } } else { collection = n.emptyList(); } - updateGlobalEmojis(p, collection); - updateAllowedGuildEmojis(p, guildMember.k(), collection); + updateGlobalEmojis(q, collection); + updateAllowedGuildEmojis(q, guildMember.k(), 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 p = guild.p(); - if (this.allowedGuildEmojis.containsKey(Long.valueOf(p))) { - this.allowedGuildEmojis.remove(Long.valueOf(p)); + long q = guild.q(); + if (this.allowedGuildEmojis.containsKey(Long.valueOf(q))) { + this.allowedGuildEmojis.remove(Long.valueOf(q)); markChanged(); } - if (this.allGuildEmoji.containsKey(Long.valueOf(p))) { - this.allGuildEmoji.remove(Long.valueOf(p)); + if (this.allGuildEmoji.containsKey(Long.valueOf(q))) { + this.allGuildEmoji.remove(Long.valueOf(q)); markChanged(); } } diff --git a/app/src/main/java/com/discord/stores/StoreGameParty.java b/app/src/main/java/com/discord/stores/StoreGameParty.java index 6674bec7eb..50fbc104ed 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 B = guild.B(); - if (B != null) { - handlePresences(B); + List C = guild.C(); + if (C != null) { + handlePresences(C); } } diff --git a/app/src/main/java/com/discord/stores/StoreGatewayConnection.java b/app/src/main/java/com/discord/stores/StoreGatewayConnection.java index a8a989fc3d..1d2e6695d2 100644 --- a/app/src/main/java/com/discord/stores/StoreGatewayConnection.java +++ b/app/src/main/java/com/discord/stores/StoreGatewayConnection.java @@ -11,6 +11,7 @@ import com.discord.api.channel.Channel; import com.discord.api.channel.ChannelRecipient; import com.discord.api.commands.ApplicationCommandAutocompleteResult; import com.discord.api.commands.GuildApplicationCommands; +import com.discord.api.embeddedactivities.EmbeddedActivityInboundUpdate; import com.discord.api.emoji.GuildEmojisUpdate; import com.discord.api.friendsuggestions.FriendSuggestion; import com.discord.api.friendsuggestions.FriendSuggestionDelete; @@ -114,6 +115,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler { private final SerializedSubject connected; private final SerializedSubject connectionReady; private final ExecutorCoroutineDispatcher coroutineDispatcher; + private final SerializedSubject embeddedActivityInboundUpdate; private final ExecutorService executor; private final SerializedSubject friendSuggestionCreate; private final SerializedSubject friendSuggestionDelete; @@ -363,6 +365,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler { this.channelRecipientAdd = new SerializedSubject<>(BehaviorSubject.k0()); this.channelRecipientRemove = new SerializedSubject<>(BehaviorSubject.k0()); this.channelUnreadUpdate = new SerializedSubject<>(BehaviorSubject.k0()); + this.embeddedActivityInboundUpdate = new SerializedSubject<>(BehaviorSubject.k0()); this.guildApplicationCommands = new SerializedSubject<>(BehaviorSubject.k0()); this.guildBanAdd = new SerializedSubject<>(PublishSubject.k0()); this.guildBanRemove = new SerializedSubject<>(PublishSubject.k0()); @@ -599,6 +602,10 @@ public final class StoreGatewayConnection implements GatewayEventHandler { return this.coroutineDispatcher; } + public final SerializedSubject getEmbeddedActivityInboundUpdate() { + return this.embeddedActivityInboundUpdate; + } + public final SerializedSubject getFriendSuggestionCreate() { return this.friendSuggestionCreate; } @@ -938,6 +945,12 @@ public final class StoreGatewayConnection implements GatewayEventHandler { return; } return; + case -1580624828: + if (str.equals("EMBEDDED_ACTIVITY_UPDATE")) { + this.embeddedActivityInboundUpdate.j.onNext(obj); + return; + } + return; case -1553569310: if (!str.equals("GUILD_JOIN_REQUEST_UPDATE")) { return; 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 277915a075..5da4d53356 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.p()), new com.discord.models.guild.Guild(guild)); + StoreGuildJoinRequest.access$getPendingGuilds$p(this.this$0.this$0.this$0).put(Long.valueOf(guild.q()), 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 2b1b754205..80ab7f1e4e 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.p()), Integer.valueOf(guild.s())); + this.guildMemberCounts.put(Long.valueOf(guild.q()), Integer.valueOf(guild.t())); } } 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.p()), Integer.valueOf(guild.s())); + this.guildMemberCounts.put(Long.valueOf(guild.q()), Integer.valueOf(guild.t())); markChanged(); } diff --git a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java index d300f1fc60..2b9f9bfb2e 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java +++ b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java @@ -564,9 +564,9 @@ public final class StoreGuildScheduledEvents extends StoreV2 { List guilds = modelPayload.getGuilds(); m.checkNotNullExpressionValue(guilds, "payload.guilds"); for (Guild guild : guilds) { - List n = guild.n(); - if (n != null) { - for (GuildScheduledEvent guildScheduledEvent : n) { + List o = guild.o(); + if (o != null) { + for (GuildScheduledEvent guildScheduledEvent : o) { processGuildScheduledEventCreateOrUpdate(guildScheduledEvent); } } @@ -577,9 +577,9 @@ public final class StoreGuildScheduledEvents extends StoreV2 { @StoreThread public final void handleGuildCreate(Guild guild) { m.checkNotNullParameter(guild, "guild"); - List n = guild.n(); - if (n != null) { - for (GuildScheduledEvent guildScheduledEvent : n) { + List o = guild.o(); + if (o != null) { + for (GuildScheduledEvent guildScheduledEvent : o) { processGuildScheduledEventCreateOrUpdate(guildScheduledEvent); } } 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 330d0ce1b8..44dc42bd97 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()).p()) { + if (j == ((Guild) it.next()).q()) { 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 b32e349b3c..08e331ed09 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.p()))) { + if (this.selectedGuildIds.remove(Long.valueOf(guild.q()))) { markChanged(); } } diff --git a/app/src/main/java/com/discord/stores/StoreGuildStickers.java b/app/src/main/java/com/discord/stores/StoreGuildStickers.java index e8a3f14853..5cab65785e 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 t = guild.t(); - if (t == null) { + List u = guild.u(); + if (u == null) { return null; } - Iterator it = t.iterator(); + Iterator it = u.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 p = guild.p(); - List I = guild.I(); - if (I == null) { - I = n.emptyList(); + long q = guild.q(); + List J = guild.J(); + if (J == null) { + J = n.emptyList(); } - updateStickers(p, I); + updateStickers(q, J); 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 d15e17e99f..52d1a2aee9 100644 --- a/app/src/main/java/com/discord/stores/StoreGuilds.java +++ b/app/src/main/java/com/discord/stores/StoreGuilds.java @@ -135,19 +135,19 @@ public final class StoreGuilds extends StoreV2 { @StoreThread private final void handleGuild(com.discord.api.guild.Guild guild, boolean z2) { - long p = guild.p(); + long q = guild.q(); if (!z2) { - Guild guild2 = this.guilds.get(Long.valueOf(p)); + Guild guild2 = this.guilds.get(Long.valueOf(q)); 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); } Guild merge = guild2.merge(guild); - if (!m.areEqual(merge, this.guilds.get(Long.valueOf(p)))) { - this.guilds.put(Long.valueOf(p), merge); + if (!m.areEqual(merge, this.guilds.get(Long.valueOf(q)))) { + this.guilds.put(Long.valueOf(q), merge); markChanged(GuildsUpdate); } - } else if (this.guilds.containsKey(Long.valueOf(p))) { - this.guilds.remove(Long.valueOf(p)); + } else if (this.guilds.containsKey(Long.valueOf(q))) { + this.guilds.remove(Long.valueOf(q)); markChanged(GuildsUpdate); } } @@ -323,19 +323,19 @@ public final class StoreGuilds extends StoreV2 { this.guildRoles.clear(); this.guildsUnavailable.clear(); for (com.discord.api.guild.Guild guild : modelPayload.getGuilds()) { - long p = guild.p(); - if (guild.M()) { - this.guildsUnavailable.add(Long.valueOf(p)); + long q = guild.q(); + if (guild.N()) { + this.guildsUnavailable.add(Long.valueOf(q)); } else { - handleGuildRoles(p, 0, guild.E(), false); + handleGuildRoles(q, 0, guild.F(), false); m.checkNotNullExpressionValue(guild, "guild"); handleGuild(guild, false); - List t = guild.t(); - if (t == null || (map = GuildUtilsKt.asMap(t)) == null) { + List u = guild.u(); + if (u == null || (map = GuildUtilsKt.asMap(u)) == null) { map = h0.emptyMap(); } - handleGuildMembersMap(p, map); - handleHasRoleAndJoinedAt(p, map); + handleGuildMembersMap(q, map); + handleHasRoleAndJoinedAt(q, map); } } markChanged(GuildsUpdate, ComputedMembersUpdate); @@ -345,16 +345,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.p(), guild.M(), false); - if (!guild.M()) { - handleGuildRoles(guild.p(), 0, guild.E(), false); + handleGuildUnavailable(guild.q(), guild.N(), false); + if (!guild.N()) { + handleGuildRoles(guild.q(), 0, guild.F(), false); handleGuild(guild, false); - List t = guild.t(); - if (t == null || (map = GuildUtilsKt.asMap(t)) == null) { + List u = guild.u(); + if (u == null || (map = GuildUtilsKt.asMap(u)) == null) { map = h0.emptyMap(); } - handleGuildMembersMap(guild.p(), map); - handleHasRoleAndJoinedAt(guild.p(), map); + handleGuildMembersMap(guild.q(), map); + handleHasRoleAndJoinedAt(guild.q(), map); } } @@ -411,10 +411,10 @@ public final class StoreGuilds extends StoreV2 { @StoreThread public final void handleGuildRemove(com.discord.api.guild.Guild guild) { m.checkNotNullParameter(guild, "guild"); - handleGuildUnavailable(guild.p(), guild.M(), true); + handleGuildUnavailable(guild.q(), guild.N(), true); handleGuild(guild, true); - handleGuildRoles(guild.p(), 0, null, true); - handleGuildMembers(guild.p(), 0, null, true); + handleGuildRoles(guild.q(), 0, null, true); + handleGuildMembers(guild.q(), 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 07235c42b9..5ce8f05504 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 @@ -45,7 +45,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.p()), (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.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); } } 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 25430b41da..6409a5bf3c 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.p()) : null; + Long valueOf = guild != null ? Long.valueOf(guild.q()) : 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 aee2a3dbf9..e99427e362 100644 --- a/app/src/main/java/com/discord/stores/StoreInstantInvites.java +++ b/app/src/main/java/com/discord/stores/StoreInstantInvites.java @@ -208,7 +208,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.p()) : null; + Long valueOf = guild != null ? Long.valueOf(guild.q()) : 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 009e2b3485..07f4586e9d 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.p()))) { + if (!this.lurkedGuilds.keySet().contains(Long.valueOf(guild.q()))) { return; } - if (guild.q() == null && (lurkContext = this.lurkedGuilds.get(Long.valueOf(guild.p()))) != null && lurkContext.getShouldNavigate()) { - this.stream.getGuildSelected$app_productionCanaryRelease().handleGuildSelected(guild.p()); - } else if (guild.q() != null) { - stopLurkingInternal(guild.p()); + 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()); } } @StoreThread public final void handleGuildRemove$app_productionCanaryRelease(com.discord.api.guild.Guild guild) { m.checkNotNullParameter(guild, "guild"); - stopLurkingInternal(guild.p()); + stopLurkingInternal(guild.q()); } @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.q() != null, guild.p(), this.lurkedGuilds.keySet()); + return Companion.access$isLurking(Companion, guild.r() != null, guild.q(), 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 32deb0a11f..0b1560c91e 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 t = guild.t(); - if (t != null) { - Iterator it = t.iterator(); + List u = guild.u(); + if (u != null) { + Iterator it = u.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.p()), guildMember.k()); + this.myRoleIds.put(Long.valueOf(guild.q()), guildMember.k()); } } List g = guild.g(); if (g != null) { for (Channel channel : g) { - this.channelGuildIds.put(Long.valueOf(channel.h()), Long.valueOf(guild.p())); + this.channelGuildIds.put(Long.valueOf(channel.h()), Long.valueOf(guild.q())); } } - List L = guild.L(); - if (L != null) { - for (Channel channel2 : L) { - this.channelGuildIds.put(Long.valueOf(channel2.h()), Long.valueOf(guild.p())); + List M = guild.M(); + if (M != null) { + for (Channel channel2 : M) { + this.channelGuildIds.put(Long.valueOf(channel2.h()), Long.valueOf(guild.q())); } } } diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck.java b/app/src/main/java/com/discord/stores/StoreMessageAck.java index d8d8b52db9..2181e59f1f 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 t = guild.t(); - if (t != null) { - Iterator it = t.iterator(); + List u = guild.u(); + if (u != null) { + Iterator it = u.iterator(); while (true) { if (!it.hasNext()) { obj = null; diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$2.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$2.java new file mode 100644 index 0000000000..1a1de8bf55 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$2.java @@ -0,0 +1,55 @@ +package com.discord.stores; + +import com.discord.utilities.rest.SendUtils; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; +/* compiled from: StoreMessages.kt */ +public final class StoreMessages$sendMessage$7$request$2 extends o implements Function1 { + public final /* synthetic */ StoreMessages$sendMessage$7 this$0; + + /* compiled from: StoreMessages.kt */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$7$request$2$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function0 { + public final /* synthetic */ String $displayName; + public final /* synthetic */ String $mimeType; + public final /* synthetic */ int $numFiles; + public final /* synthetic */ StoreMessages$sendMessage$7$request$2 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(StoreMessages$sendMessage$7$request$2 storeMessages$sendMessage$7$request$2, int i, String str, String str2) { + super(0); + this.this$0 = storeMessages$sendMessage$7$request$2; + this.$numFiles = i; + this.$displayName = str; + this.$mimeType = str2; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getMessageUploads$app_productionCanaryRelease().onPreprocessing(this.this$0.this$0.$applicationCommandLocalSendData.getNonceString(), this.$numFiles, this.$displayName, this.$mimeType); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreMessages$sendMessage$7$request$2(StoreMessages$sendMessage$7 storeMessages$sendMessage$7) { + super(1); + this.this$0 = storeMessages$sendMessage$7; + } + + /* 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(SendUtils.SendPayload.Preprocessing preprocessing) { + invoke(preprocessing); + return Unit.a; + } + + public final void invoke(SendUtils.SendPayload.Preprocessing preprocessing) { + m.checkNotNullParameter(preprocessing, ""); + StoreMessages.access$getDispatcher$p(this.this$0.this$0).schedule(new AnonymousClass1(this, preprocessing.component1(), preprocessing.component2(), preprocessing.component3())); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$3.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$3.java new file mode 100644 index 0000000000..b92444bffb --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$3.java @@ -0,0 +1,52 @@ +package com.discord.stores; + +import com.discord.utilities.rest.SendUtils; +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: StoreMessages.kt */ +public final class StoreMessages$sendMessage$7$request$3 extends o implements Function1, Unit> { + public final /* synthetic */ StoreMessages$sendMessage$7 this$0; + + /* compiled from: StoreMessages.kt */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$7$request$3$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function0 { + public final /* synthetic */ List $uploads; + public final /* synthetic */ StoreMessages$sendMessage$7$request$3 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(StoreMessages$sendMessage$7$request$3 storeMessages$sendMessage$7$request$3, List list) { + super(0); + this.this$0 = storeMessages$sendMessage$7$request$3; + this.$uploads = list; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getMessageUploads$app_productionCanaryRelease().bindUpload(this.this$0.this$0.$applicationCommandLocalSendData.getNonceString(), this.$uploads); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreMessages$sendMessage$7$request$3(StoreMessages$sendMessage$7 storeMessages$sendMessage$7) { + super(1); + this.this$0 = storeMessages$sendMessage$7; + } + + /* 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(List list) { + invoke((List) list); + return Unit.a; + } + + public final void invoke(List list) { + m.checkNotNullParameter(list, "uploads"); + StoreMessages.access$getDispatcher$p(this.this$0.this$0).schedule(new AnonymousClass1(this, list)); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java index 6275cd252b..672d97f84d 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java @@ -5,24 +5,27 @@ import com.discord.models.commands.ApplicationCommandLocalSendData; import com.discord.models.message.Message; import com.discord.utilities.messagesend.MessageRequest; import com.discord.utilities.messagesend.MessageResult; +import java.util.List; import rx.Emitter; import rx.functions.Action1; /* compiled from: StoreMessages.kt */ public final class StoreMessages$sendMessage$7 implements Action1> { public final /* synthetic */ ApplicationCommandLocalSendData $applicationCommandLocalSendData; + public final /* synthetic */ List $attachments; public final /* synthetic */ Message $message; public final /* synthetic */ StoreMessages this$0; - public StoreMessages$sendMessage$7(StoreMessages storeMessages, Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData) { + public StoreMessages$sendMessage$7(StoreMessages storeMessages, Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData, List list) { this.this$0 = storeMessages; this.$message = message; this.$applicationCommandLocalSendData = applicationCommandLocalSendData; + this.$attachments = list; } public final void call(Emitter emitter) { com.discord.api.message.Message synthesizeApiMessage = this.$message.synthesizeApiMessage(); ApplicationCommandLocalSendData applicationCommandLocalSendData = this.$applicationCommandLocalSendData; UtcDateTime timestamp = this.$message.getTimestamp(); - StoreMessages.access$getMessageQueue(this.this$0, this.$message.getChannelId()).enqueue(new MessageRequest.SendApplicationCommand(synthesizeApiMessage, applicationCommandLocalSendData, new StoreMessages$sendMessage$7$request$1(this, emitter), timestamp != null ? timestamp.g() : 0)); + StoreMessages.access$getMessageQueue(this.this$0, this.$message.getChannelId()).enqueue(new MessageRequest.SendApplicationCommand(synthesizeApiMessage, applicationCommandLocalSendData, this.$attachments, new StoreMessages$sendMessage$7$request$2(this), new StoreMessages$sendMessage$7$request$3(this), new StoreMessages$sendMessage$7$request$1(this, emitter), timestamp != null ? timestamp.g() : 0)); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessages.java b/app/src/main/java/com/discord/stores/StoreMessages.java index c60b445095..bd054765f9 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages.java +++ b/app/src/main/java/com/discord/stores/StoreMessages.java @@ -279,6 +279,15 @@ public final class StoreMessages extends Store { return storeMessages.sendMessage(j, user, str, list, list2, (i & 32) != 0 ? null : list3, (i & 64) != 0 ? null : messageReference, (i & 128) != 0 ? null : messageAllowedMentions, (i & 256) != 0 ? null : application, (i & 512) != 0 ? null : activity, (i & 1024) != 0 ? null : messageActivity, (i & 2048) != 0 ? null : l, (i & 4096) != 0 ? null : l2, (i & 8192) != 0 ? null : num); } + /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.stores.StoreMessages */ + /* JADX WARN: Multi-variable type inference failed */ + public static /* synthetic */ Observable sendMessage$default(StoreMessages storeMessages, Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData, List list, int i, Object obj) { + if ((i & 4) != 0) { + list = null; + } + return storeMessages.sendMessage(message, applicationCommandLocalSendData, list); + } + /* JADX WARNING: Removed duplicated region for block: B:19:0x0046 */ /* JADX WARNING: Removed duplicated region for block: B:36:0x007e */ /* JADX WARNING: Removed duplicated region for block: B:43:0x00c0 */ @@ -700,11 +709,11 @@ public final class StoreMessages extends Store { return n2; } - public final Observable sendMessage(Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData) { + public final Observable sendMessage(Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData, List> list) { m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(applicationCommandLocalSendData, "applicationCommandLocalSendData"); this.dispatcher.schedule(new StoreMessages$sendMessage$6(this, message)); - Observable n = Observable.n(new StoreMessages$sendMessage$7(this, message, applicationCommandLocalSendData), Emitter.BackpressureMode.NONE); + Observable n = Observable.n(new StoreMessages$sendMessage$7(this, message, applicationCommandLocalSendData, list), Emitter.BackpressureMode.NONE); m.checkNotNullExpressionValue(n, "Observable.create({ emit…er.BackpressureMode.NONE)"); return n; } diff --git a/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java b/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java index c58cb5d6e0..20ca9e59f5 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 L = guild.L(); - if (L != null) { + List M = guild.M(); + if (M != null) { Collection arrayList = new ArrayList<>(); - for (Channel channel : L) { + for (Channel channel : M) { if (ChannelUtils.C(channel)) { arrayList.add(channel); } @@ -131,10 +131,10 @@ public final class StoreMessagesMostRecent extends StoreV2 { if (g != null) { mostRecentIdsUpdateFromChannels(g); } - List L = guild.L(); - if (L != null) { + List M = guild.M(); + if (M != null) { Collection arrayList = new ArrayList<>(); - for (Channel channel : L) { + for (Channel channel : M) { 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 2b3e8c36ed..acc105182b 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.p(), this.storeChannels.getThreadsForGuildInternal$app_productionCanaryRelease(guild.p())); + updateGuildPermissions(guild.q(), this.storeChannels.getThreadsForGuildInternal$app_productionCanaryRelease(guild.q())); } @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 p = guild.p(); - this.permissionsForChannels.remove(Long.valueOf(p)); - this.permissionsForGuilds.remove(Long.valueOf(p)); + long q = guild.q(); + this.permissionsForChannels.remove(Long.valueOf(q)); + this.permissionsForGuilds.remove(Long.valueOf(q)); markChanged(); } diff --git a/app/src/main/java/com/discord/stores/StoreReviewRequest.java b/app/src/main/java/com/discord/stores/StoreReviewRequest.java index 2ce5e75da3..8ed27aaed0 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()).s() >= 5) { + if (((Guild) it.next()).t() >= 5) { z3 = true; continue; } else { diff --git a/app/src/main/java/com/discord/stores/StoreStageChannels.java b/app/src/main/java/com/discord/stores/StoreStageChannels.java index 7fd3fa184a..37338585cc 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.p())) != null) { + if (this.stageEventStates.remove(Long.valueOf(guild.q())) != null) { markStageEventDirty(); } LinkedHashSet linkedHashSet = new LinkedHashSet(); - for (Number number : this.channelsStore.getChannelsForGuild(guild.p()).keySet()) { + for (Number number : this.channelsStore.getChannelsForGuild(guild.q()).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 6c82806682..1161b02585 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 H = guild.H(); - if (H != null) { - for (StageInstance stageInstance : H) { + List I = guild.I(); + if (I != null) { + for (StageInstance stageInstance : I) { 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.p())); + Map remove = this.stageInstancesByGuild.remove(Long.valueOf(guild.q())); if (remove == null || (set = remove.keySet()) == null) { set = n0.emptySet(); } diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$75.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$75.java new file mode 100644 index 0000000000..838b408e0c --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$75.java @@ -0,0 +1,26 @@ +package com.discord.stores; + +import com.discord.api.embeddedactivities.EmbeddedActivityInboundUpdate; +import d0.z.d.k; +import d0.z.d.m; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: StoreStream.kt */ +public final /* synthetic */ class StoreStream$initGatewaySocketListeners$75 extends k implements Function1 { + public StoreStream$initGatewaySocketListeners$75(StoreStream storeStream) { + super(1, storeStream, StoreStream.class, "handleEmbeddedActivityInboundUpdate", "handleEmbeddedActivityInboundUpdate(Lcom/discord/api/embeddedactivities/EmbeddedActivityInboundUpdate;)V", 0); + } + + /* 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(EmbeddedActivityInboundUpdate embeddedActivityInboundUpdate) { + invoke(embeddedActivityInboundUpdate); + return Unit.a; + } + + public final void invoke(EmbeddedActivityInboundUpdate embeddedActivityInboundUpdate) { + m.checkNotNullParameter(embeddedActivityInboundUpdate, "p1"); + StoreStream.access$handleEmbeddedActivityInboundUpdate((StoreStream) this.receiver, embeddedActivityInboundUpdate); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreStream.java b/app/src/main/java/com/discord/stores/StoreStream.java index 317a074078..2b7746834e 100644 --- a/app/src/main/java/com/discord/stores/StoreStream.java +++ b/app/src/main/java/com/discord/stores/StoreStream.java @@ -9,6 +9,7 @@ import com.discord.api.channel.ChannelRecipient; import com.discord.api.commands.ApplicationCommandAutocompleteResult; import com.discord.api.commands.GuildApplicationCommands; import com.discord.api.connectedaccounts.ConnectedAccount; +import com.discord.api.embeddedactivities.EmbeddedActivityInboundUpdate; import com.discord.api.emoji.GuildEmojisUpdate; import com.discord.api.friendsuggestions.FriendSuggestion; import com.discord.api.friendsuggestions.FriendSuggestionDelete; @@ -148,6 +149,7 @@ public final class StoreStream { private final StoreEmojiCustom customEmojis; private final StoreDirectories directories; private final Dispatcher dispatcher; + private final StoreEmbeddedActivities embeddedActivities; private final StoreEmoji emojis; private final StoreEntitlements entitlements; private final StoreExpandedGuildFolders expandedGuildFolders; @@ -388,6 +390,10 @@ public final class StoreStream { return getCollector().getStoreDynamicLink$app_productionCanaryRelease(); } + public final StoreEmbeddedActivities getEmbeddedActivities() { + return getCollector().getEmbeddedActivities$app_productionCanaryRelease(); + } + public final StoreEmoji getEmojis() { return getCollector().getEmojis$app_productionCanaryRelease(); } @@ -953,8 +959,7 @@ public final class StoreStream { StoreStreamRtcConnection storeStreamRtcConnection = new StoreStreamRtcConnection(storeMediaEngine, this.users, this, this.dispatcher, this.clock, this.analytics, storeRtcConnection, null, null, null, 896, null); this.streamRtcConnection = storeStreamRtcConnection; this.audioManagerV2 = new StoreAudioManagerV2(ObservationDeckProvider.get(), this.dispatcher, storeVoiceChannelSelected, this.channels, storeStreamRtcConnection, videoUseDetector, this.experiments); - StoreApplicationStreamPreviews storeApplicationStreamPreviews = new StoreApplicationStreamPreviews(this.dispatcher, this.clock, null, null, 12, null); - this.applicationStreamPreviews = storeApplicationStreamPreviews; + this.applicationStreamPreviews = new StoreApplicationStreamPreviews(this.dispatcher, this.clock, null, null, 12, null); StoreGuildsSorted storeGuildsSorted = new StoreGuildsSorted(ObservationDeckProvider.get(), this.dispatcher, this.guilds, this.lurking); this.guildsSorted = storeGuildsSorted; StoreExpandedGuildFolders storeExpandedGuildFolders = new StoreExpandedGuildFolders(this.dispatcher, null, 2, null); @@ -1039,7 +1044,9 @@ public final class StoreStream { this.notificationUpsells = storeNotificationUpsells; ConnectionTimeStats connectionTimeStats = new ConnectionTimeStats(this.clock); this.connectionTimeStats = connectionTimeStats; - List listOf = n.listOf((Object[]) new StoreV2[]{this.bans, this.users, this.guilds, this.channels, this.channelConversions, this.presences, this.permissions, this.voiceChannelSelected, this.voiceSpeaking, this.accessibility, this.callsIncoming, this.connectivity, this.connectionOpen, storeGuildWelcomeScreens, storeGuildVoiceRegions, this.videoStreams, storeClientDataState, storeGifPicker, storeStickers, this.guildMemberCounts, this.guildJoinRequests, this.experiments, this.messageReplies, storeChannelFollowerStats, storePendingReplies, storeGuildProfiles, this.application, storeApplicationCommands, this.guildSelected, this.channelsSelected, this.pinnedMessages, storeGuildMemberVerificationForm, this.userRequiredAction, this.userSurvey, storePhone, storeThreadsActive, this.threadsJoined, storeThreadsActiveJoined, storeThreadMessages, archivedThreadsStore, storeThreadDraft, storeExpressionPickerNavigation, storePremiumGuildSubscription, this.collapsedChannelCategories, this.messageUploads, storeExpressionSuggestions, this.applicationStreaming, storeApplicationInteractions, storeApplicationCommandFrecency, storeLocalActionComponentState, this.stageInstances, this.requestedStageChannels, storeStageChannels, storeStageChannelSelfPresence, storeAutocomplete, this.messageReactions, this.library, this.userRelationships, this.userSettingsSystem, this.tabsNavigation, this.voiceStates, this.mentions, storeUserAffinities, this.userProfile, this.userConnections, this.messagesMostRecent, this.usersTyping, this.instantInvites, this.guildSettings, this.customEmojis, storeEntitlements, storeMediaFavorites, this.subscriptions, storeGooglePlayPurchases, storeGooglePlaySkuDetails, this.guildTemplates, this.userNotes, this.mfa, this.messageAck, this.guildSubscriptions, this.lazyChannelMembersStore, this.lazyThreadMembersStore, this.guildEmojis, storeGuildsSorted, this.auditLog, storeExpandedGuildFolders, this.maskedLinks, this.streamRtcConnection, this.paymentSources, storeContactSync, storeApplicationStreamPreviews, this.guildsNsfw, this.gameParty, storeFriendSuggestions, this.chat, this.audioManagerV2, storeGuildStickers, storeOutboundPromotions, storeDirectories, storeGuildScheduledEvents, storeGuildRoleSubscriptions, storeNotificationUpsells}); + StoreEmbeddedActivities storeEmbeddedActivities = new StoreEmbeddedActivities(null, 1, null); + this.embeddedActivities = storeEmbeddedActivities; + List listOf = n.listOf((Object[]) new StoreV2[]{this.bans, this.users, this.guilds, this.channels, this.channelConversions, this.presences, this.permissions, this.voiceChannelSelected, this.voiceSpeaking, this.accessibility, this.callsIncoming, this.connectivity, this.connectionOpen, storeGuildWelcomeScreens, storeGuildVoiceRegions, this.videoStreams, storeClientDataState, storeGifPicker, storeStickers, this.guildMemberCounts, this.guildJoinRequests, this.experiments, this.messageReplies, storeChannelFollowerStats, storePendingReplies, storeGuildProfiles, this.application, storeApplicationCommands, this.guildSelected, this.channelsSelected, this.pinnedMessages, storeGuildMemberVerificationForm, this.userRequiredAction, this.userSurvey, storePhone, storeThreadsActive, this.threadsJoined, storeThreadsActiveJoined, storeThreadMessages, archivedThreadsStore, storeThreadDraft, storeExpressionPickerNavigation, storePremiumGuildSubscription, this.collapsedChannelCategories, this.messageUploads, storeExpressionSuggestions, this.applicationStreaming, storeApplicationInteractions, storeApplicationCommandFrecency, storeLocalActionComponentState, this.stageInstances, this.requestedStageChannels, storeStageChannels, storeStageChannelSelfPresence, storeAutocomplete, this.messageReactions, this.library, this.userRelationships, this.userSettingsSystem, this.tabsNavigation, this.voiceStates, this.mentions, storeUserAffinities, this.userProfile, this.userConnections, this.messagesMostRecent, this.usersTyping, this.instantInvites, this.guildSettings, this.customEmojis, storeEntitlements, storeMediaFavorites, this.subscriptions, storeGooglePlayPurchases, storeGooglePlaySkuDetails, this.guildTemplates, this.userNotes, this.mfa, this.messageAck, this.guildSubscriptions, this.lazyChannelMembersStore, this.lazyThreadMembersStore, this.guildEmojis, storeGuildsSorted, this.auditLog, storeExpandedGuildFolders, this.maskedLinks, this.streamRtcConnection, this.paymentSources, storeContactSync, this.applicationStreamPreviews, this.guildsNsfw, this.gameParty, storeFriendSuggestions, this.chat, this.audioManagerV2, storeGuildStickers, storeOutboundPromotions, storeDirectories, storeGuildScheduledEvents, storeGuildRoleSubscriptions, storeNotificationUpsells, storeEmbeddedActivities}); this.storesV2 = listOf; StoreV2DispatchHandler storeV2DispatchHandler = new StoreV2DispatchHandler(listOf, null, 2, null); this.storeV2DispatchHandler = storeV2DispatchHandler; @@ -1153,6 +1160,10 @@ public final class StoreStream { storeStream.handleConnectionReady(z2); } + public static final /* synthetic */ void access$handleEmbeddedActivityInboundUpdate(StoreStream storeStream, EmbeddedActivityInboundUpdate embeddedActivityInboundUpdate) { + storeStream.handleEmbeddedActivityInboundUpdate(embeddedActivityInboundUpdate); + } + public static final /* synthetic */ void access$handleEmojiUpdate(StoreStream storeStream, GuildEmojisUpdate guildEmojisUpdate) { storeStream.handleEmojiUpdate(guildEmojisUpdate); } @@ -2004,6 +2015,7 @@ public final class StoreStream { this.lazyThreadMembersStore.handleConnectionOpen(); this.connectionTimeStats.handleConnectionOpen(payload); this.guildScheduledEvents.handleConnectionOpen(payload); + this.embeddedActivities.handleConnectionOpen(payload); AppLog.i("[StoreStream] Processed ready payload in " + timeElapsed.getSeconds() + " seconds"); return; } @@ -2022,6 +2034,11 @@ public final class StoreStream { this.applicationInteractions.handleConnectionReady(z2); } + @StoreThread + private final void handleEmbeddedActivityInboundUpdate(EmbeddedActivityInboundUpdate embeddedActivityInboundUpdate) { + this.embeddedActivities.handleEmbeddedActivityInboundUpdate(embeddedActivityInboundUpdate); + } + @StoreThread private final void handleEmojiUpdate(GuildEmojisUpdate guildEmojisUpdate) { this.customEmojis.handleEmojiUpdate(guildEmojisUpdate); @@ -2068,6 +2085,7 @@ public final class StoreStream { this.threadsActiveJoined.handleGuildCreate(guild); this.messageAck.handleGuildCreate(); this.threadMessages.handleGuildCreate(guild); + this.embeddedActivities.handleGuildCreate(guild); } @StoreThread @@ -2093,6 +2111,7 @@ public final class StoreStream { this.clientDataState.handleGuildAdd(guild2); this.guildStickers.handleGuildCreateOrUpdate(guild2); this.guildScheduledEvents.handleGuildCreate(guild2); + this.embeddedActivities.handleGuildCreate(guild2); return; } handleHydrateError(); @@ -2157,9 +2176,9 @@ public final class StoreStream { private final void handleGuildRemove(Guild guild) { if (guild != null) { this.guilds.handleGuildRemove(guild); - this.guildMemberCounts.handleGuildDelete(guild.p()); - this.guildSubscriptions.handleGuildRemove(guild.p()); - this.lazyChannelMembersStore.handleGuildRemove(guild.p()); + this.guildMemberCounts.handleGuildDelete(guild.q()); + this.guildSubscriptions.handleGuildRemove(guild.q()); + this.lazyChannelMembersStore.handleGuildRemove(guild.q()); this.presences.handleGuildRemove(guild); this.guildSelected.handleGuildRemove(guild); this.channels.handleGuildRemove(guild); @@ -2172,13 +2191,13 @@ public final class StoreStream { this.voiceStates.handleGuildRemove(guild); this.lurking.handleGuildRemove$app_productionCanaryRelease(guild); this.clientDataState.handleGuildRemove(guild); - this.threadsActive.handleGuildDelete(guild.p()); - this.threadsJoined.handleGuildDelete(guild.p()); - this.threadsActiveJoined.handleGuildDelete(guild.p()); - this.threadMessages.handleGuildDelete(guild.p()); - this.guildJoinRequests.handleGuildRemove(guild.p()); - this.guildStickers.handleGuildRemove(guild.p()); - this.guildScheduledEvents.handleGuildRemove(guild.p()); + 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()); } } @@ -2649,6 +2668,7 @@ public final class StoreStream { dispatchSubscribe(this.gatewaySocket.getGuildScheduledEventDelete(), "guildScheduledEventDelete", new StoreStream$initGatewaySocketListeners$72(this)); dispatchSubscribe(this.gatewaySocket.getGuildScheduledEventUserAdd(), "guildScheduledEventUserAdd", new StoreStream$initGatewaySocketListeners$73(this)); dispatchSubscribe(this.gatewaySocket.getGuildScheduledEventUserRemove(), "guildScheduledEventUserRemove", new StoreStream$initGatewaySocketListeners$74(this)); + dispatchSubscribe(this.gatewaySocket.getEmbeddedActivityInboundUpdate(), "embeddedActivityInboundUpdate", new StoreStream$initGatewaySocketListeners$75(this)); } private final void maybeLogNotificationPermissionStatus(Application application, Clock clock) { @@ -2822,6 +2842,10 @@ public final class StoreStream { return this.directories; } + public final StoreEmbeddedActivities getEmbeddedActivities$app_productionCanaryRelease() { + return this.embeddedActivities; + } + public final StoreEmoji getEmojis$app_productionCanaryRelease() { return this.emojis; } diff --git a/app/src/main/java/com/discord/stores/StoreThreadMessages.java b/app/src/main/java/com/discord/stores/StoreThreadMessages.java index 69da8869c9..3748a5908e 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 L = guild.L(); - if (L != null) { - for (Channel channel : L) { + List M = guild.M(); + if (M != null) { + for (Channel channel : M) { 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 ca89c18e17..24c6d779bf 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.p()); + List threadsForGuildInternal$app_productionCanaryRelease = this.storeChannels.getThreadsForGuildInternal$app_productionCanaryRelease(guild.q()); if (!threadsForGuildInternal$app_productionCanaryRelease.isEmpty()) { Map> map = this.threadsByGuild; - Long valueOf = Long.valueOf(guild.p()); + Long valueOf = Long.valueOf(guild.q()); 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.p()); + deleteThreads(guild.q()); 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 4dd4ff5f62..d1c118df4f 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.p())); + saveThreads(Long.valueOf(guild.q())); } @StoreThread diff --git a/app/src/main/java/com/discord/stores/StoreThreadsJoined.java b/app/src/main/java/com/discord/stores/StoreThreadsJoined.java index 691d55d575..9bc62b8b26 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 L = guild.L(); - if (L != null) { - for (Channel channel : L) { + List M = guild.M(); + if (M != null) { + for (Channel channel : M) { if (ChannelUtils.C(channel) && (j = channel.j()) != null) { - this.joinedThreads.put(Long.valueOf(channel.h()), new JoinedThread(channel.h(), guild.p(), j.a(), j.e(), new ModelMuteConfig(j.d()), j.c())); + this.joinedThreads.put(Long.valueOf(channel.h()), new JoinedThread(channel.h(), guild.q(), 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.p()); + deleteThreads(guild.q()); 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 018554b71c..149b1f456c 100644 --- a/app/src/main/java/com/discord/stores/StoreUser.java +++ b/app/src/main/java/com/discord/stores/StoreUser.java @@ -254,9 +254,9 @@ public final class StoreUser extends StoreV2 { } } for (Guild guild : modelPayload.getGuilds()) { - List t = guild.t(); - if (t != null) { - for (GuildMember guildMember : t) { + List u = guild.u(); + if (u != null) { + for (GuildMember guildMember : u) { this.users.put(Long.valueOf(guildMember.l().i()), new CoreUser(guildMember.l())); } } @@ -288,9 +288,9 @@ public final class StoreUser extends StoreV2 { @StoreThread public final void handleGuildAddOrSync(Guild guild) { m.checkNotNullParameter(guild, "guild"); - List t = guild.t(); - if (t != null) { - for (GuildMember guildMember : t) { + List u = guild.u(); + if (u != null) { + for (GuildMember guildMember : u) { updateUser(guildMember.l()); } } diff --git a/app/src/main/java/com/discord/stores/StoreUserPresence.java b/app/src/main/java/com/discord/stores/StoreUserPresence.java index 4af1417714..eb84725bf3 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 B = guild.B(); - if (B != null) { - for (com.discord.api.presence.Presence presence : B) { + List C = guild.C(); + if (C != null) { + for (com.discord.api.presence.Presence presence : C) { User f = presence.f(); if (f != null) { - handlePresenceUpdate(guild.p(), f.i(), presence.e(), presence.c(), presence.b()); + handlePresenceUpdate(guild.q(), 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.p()); + clearPresences(guild.q()); } @StoreThread diff --git a/app/src/main/java/com/discord/stores/StoreVoiceStates.java b/app/src/main/java/com/discord/stores/StoreVoiceStates.java index 58e76d11fd..04104128a7 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 P = guild.P(); - if (P != null) { - for (VoiceState voiceState : P) { - updateVoiceState(voiceState, Long.valueOf(guild.p())); + List Q = guild.Q(); + if (Q != null) { + for (VoiceState voiceState : Q) { + updateVoiceState(voiceState, Long.valueOf(guild.q())); } } } @@ -168,10 +168,10 @@ public final class StoreVoiceStates extends StoreV2 { @StoreThread public final void handleGuildAdd(Guild guild) { m.checkNotNullParameter(guild, "guild"); - List P = guild.P(); - if (P != null) { - for (VoiceState voiceState : P) { - updateVoiceState(voiceState, Long.valueOf(guild.p())); + List Q = guild.Q(); + if (Q != null) { + for (VoiceState voiceState : Q) { + updateVoiceState(voiceState, Long.valueOf(guild.q())); } } } @@ -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.p())); - this.dirtyGuildIds.add(Long.valueOf(guild.p())); + this.voiceStates.remove(Long.valueOf(guild.q())); + this.dirtyGuildIds.add(Long.valueOf(guild.q())); 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 d500e81552..dae0368363 100644 --- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java +++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java @@ -609,7 +609,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.p()) : null; + Long valueOf = guild != null ? Long.valueOf(guild.q()) : null; Channel channel = modelInvite.getChannel(); Long valueOf2 = channel != null ? Long.valueOf(channel.h()) : null; Channel channel2 = modelInvite.getChannel(); @@ -651,7 +651,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.p()) : null; + Long valueOf = guild != null ? Long.valueOf(guild.q()) : null; Channel channel = modelInvite.getChannel(); Long valueOf2 = channel != null ? Long.valueOf(channel.h()) : null; Channel channel2 = modelInvite.getChannel(); @@ -1454,7 +1454,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.p())); + mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(guild.q())); } User inviter = modelInvite.getInviter(); if (inviter != null) { @@ -1578,7 +1578,7 @@ public final class AnalyticsTracker { } com.discord.api.guild.Guild guild = modelInvite.getGuild(); if (guild != null) { - map.put("invite_guild_id", Long.valueOf(guild.p())); + map.put("invite_guild_id", Long.valueOf(guild.q())); } User inviter = modelInvite.getInviter(); if (inviter != 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 805d266297..00869f38f7 100644 --- a/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java +++ b/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java @@ -14,6 +14,7 @@ import com.discord.utilities.premium.PremiumUtils; import com.discord.utilities.voice.Bitrate; import d0.d0.f; import d0.t.g0; +import d0.t.n; import d0.t.o; import d0.t.u; import d0.z.d.m; @@ -39,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); + 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()); } 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 dc5b94bd86..9d6fb7113a 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.v(); + str = (modelInvite == null || (guild2 = modelInvite.getGuild()) == null) ? null : guild2.w(); } if (str != null) { MemberVerificationSuccessDialog.Companion.enqueue(str); @@ -93,7 +93,7 @@ public final class MemberVerificationUtils { Collection collection; com.discord.api.guild.Guild guild2; if (guild == null || (collection = guild.getFeatures()) == null) { - collection = (modelInvite == null || (guild2 = modelInvite.getGuild()) == null) ? null : guild2.l(); + collection = (modelInvite == null || (guild2 = modelInvite.getGuild()) == null) ? null : guild2.m(); } if (collection == null) { collection = n0.emptySet(); diff --git a/app/src/main/java/com/discord/utilities/guildscheduledevent/GuildScheduledEventUtilitiesKt.java b/app/src/main/java/com/discord/utilities/guildscheduledevent/GuildScheduledEventUtilitiesKt.java index 6d38547514..96a028efe8 100644 --- a/app/src/main/java/com/discord/utilities/guildscheduledevent/GuildScheduledEventUtilitiesKt.java +++ b/app/src/main/java/com/discord/utilities/guildscheduledevent/GuildScheduledEventUtilitiesKt.java @@ -5,6 +5,7 @@ import android.text.format.DateUtils; import c.a.k.b; import com.discord.R; import com.discord.api.guildscheduledevent.GuildScheduledEvent; +import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType; import com.discord.api.guildscheduledevent.GuildScheduledEventStatus; import com.discord.models.guild.UserGuildMember; import com.discord.models.user.User; @@ -16,24 +17,49 @@ import com.discord.utilities.time.TimeUtils; import com.discord.widgets.guildscheduledevent.GuildScheduledEventModel; import d0.z.d.m; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Collection; import java.util.Iterator; import java.util.Locale; +import java.util.Objects; /* compiled from: GuildScheduledEventUtilities.kt */ public final class GuildScheduledEventUtilitiesKt { public final /* synthetic */ class WhenMappings { public static final /* synthetic */ int[] $EnumSwitchMapping$0; + public static final /* synthetic */ int[] $EnumSwitchMapping$1; + public static final /* synthetic */ int[] $EnumSwitchMapping$2; + public static final /* synthetic */ int[] $EnumSwitchMapping$3; static { - GuildScheduledEventTiming.values(); - int[] iArr = new int[7]; + GuildScheduledEventEntityType.values(); + int[] iArr = new int[5]; $EnumSwitchMapping$0 = iArr; - iArr[GuildScheduledEventTiming.EXPIRED.ordinal()] = 1; - iArr[GuildScheduledEventTiming.NOW.ordinal()] = 2; - iArr[GuildScheduledEventTiming.SOON.ordinal()] = 3; - iArr[GuildScheduledEventTiming.TODAY.ordinal()] = 4; - iArr[GuildScheduledEventTiming.TOMORROW.ordinal()] = 5; + iArr[GuildScheduledEventEntityType.EXTERNAL.ordinal()] = 1; + GuildScheduledEventTiming.values(); + int[] iArr2 = new int[7]; + $EnumSwitchMapping$1 = iArr2; + GuildScheduledEventTiming guildScheduledEventTiming = GuildScheduledEventTiming.LIVE; + iArr2[guildScheduledEventTiming.ordinal()] = 1; + iArr2[GuildScheduledEventTiming.EXPIRED.ordinal()] = 2; + iArr2[GuildScheduledEventTiming.NOW.ordinal()] = 3; + GuildScheduledEventTiming guildScheduledEventTiming2 = GuildScheduledEventTiming.SOON; + iArr2[guildScheduledEventTiming2.ordinal()] = 4; + GuildScheduledEventTiming guildScheduledEventTiming3 = GuildScheduledEventTiming.TODAY; + iArr2[guildScheduledEventTiming3.ordinal()] = 5; + GuildScheduledEventTiming guildScheduledEventTiming4 = GuildScheduledEventTiming.TOMORROW; + iArr2[guildScheduledEventTiming4.ordinal()] = 6; + GuildScheduledEventTiming.values(); + int[] iArr3 = new int[7]; + $EnumSwitchMapping$2 = iArr3; + iArr3[guildScheduledEventTiming.ordinal()] = 1; + iArr3[guildScheduledEventTiming2.ordinal()] = 2; + iArr3[guildScheduledEventTiming3.ordinal()] = 3; + GuildScheduledEventTiming.values(); + int[] iArr4 = new int[7]; + $EnumSwitchMapping$3 = iArr4; + iArr4[guildScheduledEventTiming4.ordinal()] = 1; + iArr4[GuildScheduledEventTiming.LATER.ordinal()] = 2; } } @@ -89,47 +115,69 @@ public final class GuildScheduledEventUtilitiesKt { return getCreatorUserGuildMember(guildScheduledEventModel, storeGuilds, storeUser); } - public static final CharSequence getEventStartingTimeString(long j, Context context) { + public static final CharSequence getEventEndingTimeString(Context context, long j, long j2, GuildScheduledEventStatus guildScheduledEventStatus) { m.checkNotNullParameter(context, "context"); - int ordinal = getEventTiming(j).ordinal(); - if (ordinal == 1 || ordinal == 2) { - return b.h(context, R.string.guild_event_date_at_time, new Object[]{DateUtils.getRelativeTimeSpanString(j, ClockFactory.get().currentTimeMillis(), 86400000), new SimpleDateFormat("h:mm a", Locale.getDefault()).format(Long.valueOf(j))}, null, 4); + m.checkNotNullParameter(guildScheduledEventStatus, "status"); + if (!isSameDay(j, j2)) { + return null; } - if (ordinal == 3) { - return b.h(context, R.string.starting_in_minutes, new Object[]{Integer.valueOf(minutesRelativeToTime(j))}, null, 4); + if (DateUtils.isToday(j2)) { + int ordinal = getEventTiming(j, guildScheduledEventStatus).ordinal(); + if (ordinal == 2 || ordinal == 3 || ordinal == 5) { + return b.h(context, R.string.ending_on_date, new Object[]{new SimpleDateFormat("h:mm a", Locale.getDefault()).format(Long.valueOf(j2))}, null, 4); + } + return null; } - if (ordinal == 4 || ordinal == 6) { - return b.h(context, R.string.starting_soon, new Object[0], null, 4); + int ordinal2 = getEventTiming(j, guildScheduledEventStatus).ordinal(); + if (ordinal2 == 0 || ordinal2 == 1) { + return new SimpleDateFormat("h:mm a", Locale.getDefault()).format(Long.valueOf(j2)); + } + return null; + } + + public static final CharSequence getEventStartingTimeString(Context context, long j, GuildScheduledEventEntityType guildScheduledEventEntityType, GuildScheduledEventStatus guildScheduledEventStatus) { + m.checkNotNullParameter(context, "context"); + m.checkNotNullParameter(guildScheduledEventEntityType, "entityType"); + m.checkNotNullParameter(guildScheduledEventStatus, "status"); + GuildScheduledEventTiming eventTiming = getEventTiming(j, guildScheduledEventStatus); + Objects.requireNonNull(GuildScheduledEventStatus.Companion); + if (GuildScheduledEventStatus.access$getDONE$cp().contains(guildScheduledEventStatus)) { + return getNonRelativeTimeString(j); + } + switch (eventTiming.ordinal()) { + case 1: + case 2: + return b.h(context, R.string.guild_event_date_at_time, new Object[]{DateUtils.getRelativeTimeSpanString(j, ClockFactory.get().currentTimeMillis(), 86400000), new SimpleDateFormat("h:mm a", Locale.getDefault()).format(Long.valueOf(j))}, null, 4); + case 3: + return b.h(context, R.string.starting_in_minutes, new Object[]{Integer.valueOf(minutesRelativeToTime(j))}, null, 4); + case 4: + case 6: + return b.h(context, R.string.starting_soon, new Object[0], null, 4); + case 5: + return guildScheduledEventEntityType.ordinal() != 3 ? b.h(context, R.string.stage_channel_live_now, new Object[0], null, 4) : b.h(context, R.string.active_now, new Object[0], null, 4); + default: + return getNonRelativeTimeString(j); } - String nonRelativeTimeString = getNonRelativeTimeString(j); - m.checkNotNullExpressionValue(nonRelativeTimeString, "getNonRelativeTimeString()"); - return nonRelativeTimeString; } public static final CharSequence getEventStartingTimeString(GuildScheduledEvent guildScheduledEvent, Context context) { m.checkNotNullParameter(guildScheduledEvent, "$this$getEventStartingTimeString"); m.checkNotNullParameter(context, "context"); - GuildScheduledEventTiming eventTiming = getEventTiming(guildScheduledEvent); - long g = guildScheduledEvent.k().g(); - if (eventTiming == GuildScheduledEventTiming.LIVE) { - return b.h(context, R.string.stage_channel_live_now, new Object[0], null, 4); - } - if (guildScheduledEvent.l() != GuildScheduledEventStatus.COMPLETED && guildScheduledEvent.l() != GuildScheduledEventStatus.CANCELED) { - return getEventStartingTimeString(g, context); - } - String nonRelativeTimeString = getNonRelativeTimeString(g); - m.checkNotNullExpressionValue(nonRelativeTimeString, "startTimeMillis.getNonRelativeTimeString()"); - return nonRelativeTimeString; + return getEventStartingTimeString(context, guildScheduledEvent.k().g(), guildScheduledEvent.f(), guildScheduledEvent.l()); } - public static final GuildScheduledEventTiming getEventTiming(long j) { + public static final GuildScheduledEventTiming getEventTiming(long j, GuildScheduledEventStatus guildScheduledEventStatus) { + m.checkNotNullParameter(guildScheduledEventStatus, "status"); + if (guildScheduledEventStatus == GuildScheduledEventStatus.ACTIVE) { + return GuildScheduledEventTiming.LIVE; + } int minutesRelativeToTime = minutesRelativeToTime(j); return minutesRelativeToTime <= -60 ? GuildScheduledEventTiming.EXPIRED : minutesRelativeToTime <= 0 ? GuildScheduledEventTiming.NOW : minutesRelativeToTime <= 15 ? GuildScheduledEventTiming.SOON : DateUtils.isToday(j) ? GuildScheduledEventTiming.TODAY : DateUtils.isToday(j - 86400000) ? GuildScheduledEventTiming.TOMORROW : GuildScheduledEventTiming.LATER; } public static final GuildScheduledEventTiming getEventTiming(GuildScheduledEvent guildScheduledEvent) { m.checkNotNullParameter(guildScheduledEvent, "$this$getEventTiming"); - return guildScheduledEvent.l() == GuildScheduledEventStatus.ACTIVE ? GuildScheduledEventTiming.LIVE : getEventTiming(guildScheduledEvent.k().g()); + return getEventTiming(guildScheduledEvent.k().g(), guildScheduledEvent.l()); } public static final GuildScheduledEvent getLiveEvent(Collection collection) { @@ -157,8 +205,10 @@ public final class GuildScheduledEventUtilitiesKt { return (GuildScheduledEvent) obj; } - private static final String getNonRelativeTimeString(long j) { - return new SimpleDateFormat("EEE, MMM d · h:mm a", Locale.getDefault()).format(Long.valueOf(j)); + private static final CharSequence getNonRelativeTimeString(long j) { + String format = (isCurrentYear(j) ? new SimpleDateFormat("EEE, MMM d · h:mm a", Locale.getDefault()) : new SimpleDateFormat("EEE, MMM d, yyyy · h:mm a", Locale.getDefault())).format(Long.valueOf(j)); + m.checkNotNullExpressionValue(format, "dateFormat.format(this)"); + return format; } public static final boolean hasLiveEvent(Collection collection) { @@ -166,6 +216,26 @@ public final class GuildScheduledEventUtilitiesKt { return getLiveEvent(collection) != null; } + private static final boolean isCurrentYear(long j) { + Calendar instance = Calendar.getInstance(); + Calendar instance2 = Calendar.getInstance(); + m.checkNotNullExpressionValue(instance, "eventCalendar"); + instance.setTimeInMillis(j); + m.checkNotNullExpressionValue(instance2, "nowCalendar"); + instance2.setTimeInMillis(ClockFactory.get().currentTimeMillis()); + return instance.get(1) == instance2.get(1); + } + + private static final boolean isSameDay(long j, long j2) { + Calendar instance = Calendar.getInstance(); + Calendar instance2 = Calendar.getInstance(); + m.checkNotNullExpressionValue(instance, "eventCalendar"); + instance.setTimeInMillis(j); + m.checkNotNullExpressionValue(instance2, "nowCalendar"); + instance2.setTimeInMillis(j2); + return instance.get(1) == instance2.get(1) && instance.get(2) == instance2.get(2) && instance.get(5) == instance2.get(5); + } + public static final int minutesRelativeToTime(long j) { TimeUtils timeUtils = TimeUtils.INSTANCE; int minutesFromMillis = timeUtils.getMinutesFromMillis(j - ClockFactory.get().currentTimeMillis()); diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$$inlined$filterIs$1.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$$inlined$filterIs$1.java new file mode 100644 index 0000000000..6d58f1ae5d --- /dev/null +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$$inlined$filterIs$1.java @@ -0,0 +1,13 @@ +package com.discord.utilities.messagesend; + +import com.discord.utilities.rest.SendUtils; +import j0.k.b; +/* compiled from: ObservableExtensions.kt */ +public final class MessageQueue$doSendApplicationCommand$$inlined$filterIs$1 implements b { + public static final MessageQueue$doSendApplicationCommand$$inlined$filterIs$1 INSTANCE = new MessageQueue$doSendApplicationCommand$$inlined$filterIs$1(); + + @Override // j0.k.b + public final Boolean call(Object obj) { + return Boolean.valueOf(obj instanceof SendUtils.SendPayload.ReadyToSendCommand); + } +} diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$$inlined$filterIs$2.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$$inlined$filterIs$2.java new file mode 100644 index 0000000000..b02111c87a --- /dev/null +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$$inlined$filterIs$2.java @@ -0,0 +1,15 @@ +package com.discord.utilities.messagesend; + +import com.discord.utilities.rest.SendUtils; +import j0.k.b; +import java.util.Objects; +/* compiled from: ObservableExtensions.kt */ +public final class MessageQueue$doSendApplicationCommand$$inlined$filterIs$2 implements b { + public static final MessageQueue$doSendApplicationCommand$$inlined$filterIs$2 INSTANCE = new MessageQueue$doSendApplicationCommand$$inlined$filterIs$2(); + + @Override // j0.k.b + public final T call(Object obj) { + Objects.requireNonNull(obj, "null cannot be cast to non-null type com.discord.utilities.rest.SendUtils.SendPayload.ReadyToSendCommand"); + return (T) ((SendUtils.SendPayload.ReadyToSendCommand) obj); + } +} diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$1.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$1.java index f93b482d1d..27b2faac9f 100644 --- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$1.java +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$1.java @@ -1,33 +1,24 @@ package com.discord.utilities.messagesend; -import com.discord.utilities.messagesend.MessageQueue; import com.discord.utilities.messagesend.MessageRequest; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; +import com.discord.utilities.rest.SendUtils; +import rx.functions.Action1; /* compiled from: MessageQueue.kt */ -public final class MessageQueue$doSendApplicationCommand$1 extends o implements Function1 { - public final /* synthetic */ MessageQueue.DrainListener $drainListener; +public final class MessageQueue$doSendApplicationCommand$1 implements Action1 { public final /* synthetic */ MessageRequest.SendApplicationCommand $sendApplicationCommandRequest; - public final /* synthetic */ MessageQueue this$0; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public MessageQueue$doSendApplicationCommand$1(MessageQueue messageQueue, MessageRequest.SendApplicationCommand sendApplicationCommand, MessageQueue.DrainListener drainListener) { - super(1); - this.this$0 = messageQueue; + public MessageQueue$doSendApplicationCommand$1(MessageRequest.SendApplicationCommand sendApplicationCommand) { this.$sendApplicationCommandRequest = sendApplicationCommand; - this.$drainListener = drainListener; } - /* 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(Void r1) { - invoke(r1); - return Unit.a; - } - - public final void invoke(Void r3) { - MessageQueue.access$handleSuccess(this.this$0, this.$sendApplicationCommandRequest.getMessage(), this.$drainListener); + public final void call(SendUtils.SendPayload sendPayload) { + if (sendPayload instanceof SendUtils.SendPayload.Preprocessing) { + this.$sendApplicationCommandRequest.getOnPreprocessing().invoke(sendPayload); + } else if (sendPayload instanceof SendUtils.SendPayload.ReadyToSendCommand) { + SendUtils.SendPayload.ReadyToSendCommand readyToSendCommand = (SendUtils.SendPayload.ReadyToSendCommand) sendPayload; + if (!readyToSendCommand.getUploads().isEmpty()) { + this.$sendApplicationCommandRequest.getOnProgress().invoke(readyToSendCommand.getUploads()); + } + } } } diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$2.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$2.java index 810cc18302..f6f4c685a6 100644 --- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$2.java +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$2.java @@ -1,33 +1,37 @@ package com.discord.utilities.messagesend; -import com.discord.utilities.error.Error; -import com.discord.utilities.messagesend.MessageQueue; -import d0.z.d.m; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; +import com.discord.restapi.PayloadJSON; +import com.discord.restapi.RestAPIParams; +import com.discord.utilities.rest.RestAPI; +import com.discord.utilities.rest.SendUtils; +import d0.t.o; +import j0.k.b; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import okhttp3.MultipartBody; +import rx.Observable; /* compiled from: MessageQueue.kt */ -public final class MessageQueue$doSendApplicationCommand$2 extends o implements Function1 { - public final /* synthetic */ MessageQueue.DrainListener $drainListener; - public final /* synthetic */ MessageQueue this$0; +public final class MessageQueue$doSendApplicationCommand$2 implements b> { + public static final MessageQueue$doSendApplicationCommand$2 INSTANCE = new MessageQueue$doSendApplicationCommand$2(); - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public MessageQueue$doSendApplicationCommand$2(MessageQueue messageQueue, MessageQueue.DrainListener drainListener) { - super(1); - this.this$0 = messageQueue; - this.$drainListener = drainListener; - } - - /* 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(Error error) { - invoke(error); - return Unit.a; - } - - public final void invoke(Error error) { - m.checkNotNullParameter(error, "it"); - MessageQueue.access$handleError(this.this$0, error, this.$drainListener); + /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: java.util.ArrayList */ + /* JADX WARN: Multi-variable type inference failed */ + public final Observable call(SendUtils.SendPayload.ReadyToSendCommand readyToSendCommand) { + List uploads = readyToSendCommand.getUploads(); + ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(uploads, 10)); + Iterator it = uploads.iterator(); + while (it.hasNext()) { + arrayList.add(it.next().getPart()); + } + if (!(!arrayList.isEmpty())) { + return RestAPI.Companion.getApi().sendApplicationCommand(readyToSendCommand.getCommand().toRestApiParam()); + } + RestAPI api = RestAPI.Companion.getApi(); + PayloadJSON payloadJSON = new PayloadJSON<>(readyToSendCommand.getCommand().toRestApiParam()); + Object[] array = arrayList.toArray(new MultipartBody.Part[0]); + Objects.requireNonNull(array, "null cannot be cast to non-null type kotlin.Array"); + return api.sendApplicationCommand(payloadJSON, (MultipartBody.Part[]) array); } } diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$3.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$3.java index 583b1b53d4..31fc08e24c 100644 --- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$3.java +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$3.java @@ -1,15 +1,12 @@ package com.discord.utilities.messagesend; -import com.discord.utilities.analytics.Traits; import com.discord.utilities.messagesend.MessageQueue; import com.discord.utilities.messagesend.MessageRequest; -import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; -import rx.Subscription; /* compiled from: MessageQueue.kt */ -public final class MessageQueue$doSendApplicationCommand$3 extends o implements Function1 { +public final class MessageQueue$doSendApplicationCommand$3 extends o implements Function1 { public final /* synthetic */ MessageQueue.DrainListener $drainListener; public final /* synthetic */ MessageRequest.SendApplicationCommand $sendApplicationCommandRequest; public final /* synthetic */ MessageQueue this$0; @@ -25,13 +22,12 @@ public final class MessageQueue$doSendApplicationCommand$3 extends o implements /* 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(Subscription subscription) { - invoke(subscription); + public /* bridge */ /* synthetic */ Unit invoke(Void r1) { + invoke(r1); return Unit.a; } - public final void invoke(Subscription subscription) { - m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION); - MessageQueue.access$setInFlightRequest$p(this.this$0, new MessageQueue.InflightRequest(this.$sendApplicationCommandRequest, subscription, this.$drainListener)); + public final void invoke(Void r3) { + MessageQueue.access$handleSuccess(this.this$0, this.$sendApplicationCommandRequest.getMessage(), this.$drainListener); } } diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$4.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$4.java new file mode 100644 index 0000000000..2db271f6df --- /dev/null +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$4.java @@ -0,0 +1,33 @@ +package com.discord.utilities.messagesend; + +import com.discord.utilities.error.Error; +import com.discord.utilities.messagesend.MessageQueue; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: MessageQueue.kt */ +public final class MessageQueue$doSendApplicationCommand$4 extends o implements Function1 { + public final /* synthetic */ MessageQueue.DrainListener $drainListener; + public final /* synthetic */ MessageQueue this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public MessageQueue$doSendApplicationCommand$4(MessageQueue messageQueue, MessageQueue.DrainListener drainListener) { + super(1); + this.this$0 = messageQueue; + this.$drainListener = drainListener; + } + + /* 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(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "it"); + MessageQueue.access$handleError(this.this$0, error, this.$drainListener); + } +} diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$5.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$5.java new file mode 100644 index 0000000000..d1138b7acd --- /dev/null +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$5.java @@ -0,0 +1,37 @@ +package com.discord.utilities.messagesend; + +import com.discord.utilities.analytics.Traits; +import com.discord.utilities.messagesend.MessageQueue; +import com.discord.utilities.messagesend.MessageRequest; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +import rx.Subscription; +/* compiled from: MessageQueue.kt */ +public final class MessageQueue$doSendApplicationCommand$5 extends o implements Function1 { + public final /* synthetic */ MessageQueue.DrainListener $drainListener; + public final /* synthetic */ MessageRequest.SendApplicationCommand $sendApplicationCommandRequest; + public final /* synthetic */ MessageQueue this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public MessageQueue$doSendApplicationCommand$5(MessageQueue messageQueue, MessageRequest.SendApplicationCommand sendApplicationCommand, MessageQueue.DrainListener drainListener) { + super(1); + this.this$0 = messageQueue; + this.$sendApplicationCommandRequest = sendApplicationCommand; + this.$drainListener = drainListener; + } + + /* 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(Subscription subscription) { + invoke(subscription); + return Unit.a; + } + + public final void invoke(Subscription subscription) { + m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION); + MessageQueue.access$setInFlightRequest$p(this.this$0, new MessageQueue.InflightRequest(this.$sendApplicationCommandRequest, subscription, this.$drainListener)); + } +} diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java index 90b6695855..43511d20dd 100644 --- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java @@ -229,9 +229,15 @@ public final class MessageQueue { } private final void doSendApplicationCommand(MessageRequest.SendApplicationCommand sendApplicationCommand, DrainListener drainListener) { - Observable restSubscribeOn = ObservableExtensionsKt.restSubscribeOn(RestAPI.Companion.getApi().sendApplicationCommand(sendApplicationCommand.getApplicationCommandSendData().toRestApiParam()), false); - MessageQueue$doSendApplicationCommand$1 messageQueue$doSendApplicationCommand$1 = new MessageQueue$doSendApplicationCommand$1(this, sendApplicationCommand, drainListener); - ObservableExtensionsKt.appSubscribe$default(restSubscribeOn, MessageQueue.class, (Context) null, new MessageQueue$doSendApplicationCommand$3(this, sendApplicationCommand, drainListener), new MessageQueue$doSendApplicationCommand$2(this, drainListener), (Function0) null, (Function0) null, messageQueue$doSendApplicationCommand$1, 50, (Object) null); + Observable t = SendUtils.INSTANCE.getSendCommandPayload(this.contentResolver, sendApplicationCommand.getApplicationCommandSendData(), sendApplicationCommand.getAttachments()).t(new MessageQueue$doSendApplicationCommand$1(sendApplicationCommand)); + m.checkNotNullExpressionValue(t, "SendUtils\n .getSe… }\n }\n }"); + Observable F = t.x(MessageQueue$doSendApplicationCommand$$inlined$filterIs$1.INSTANCE).F(MessageQueue$doSendApplicationCommand$$inlined$filterIs$2.INSTANCE); + m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }"); + Observable z2 = F.y().z(MessageQueue$doSendApplicationCommand$2.INSTANCE); + m.checkNotNullExpressionValue(z2, "SendUtils\n .getSe…())\n }\n }"); + Observable restSubscribeOn = ObservableExtensionsKt.restSubscribeOn(z2, false); + MessageQueue$doSendApplicationCommand$3 messageQueue$doSendApplicationCommand$3 = new MessageQueue$doSendApplicationCommand$3(this, sendApplicationCommand, drainListener); + ObservableExtensionsKt.appSubscribe$default(restSubscribeOn, MessageQueue.class, (Context) null, new MessageQueue$doSendApplicationCommand$5(this, sendApplicationCommand, drainListener), new MessageQueue$doSendApplicationCommand$4(this, drainListener), (Function0) null, (Function0) null, messageQueue$doSendApplicationCommand$3, 50, (Object) null); } private final void handleError(Error error, DrainListener drainListener) { diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageRequest.java b/app/src/main/java/com/discord/utilities/messagesend/MessageRequest.java index d436c3bd13..e3d1f19be7 100644 --- a/app/src/main/java/com/discord/utilities/messagesend/MessageRequest.java +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageRequest.java @@ -138,26 +138,50 @@ public abstract class MessageRequest { /* compiled from: MessageQueue.kt */ public static final class SendApplicationCommand extends MessageRequest { private final ApplicationCommandLocalSendData applicationCommandSendData; + private final List> attachments; private final com.discord.api.message.Message message; + private final Function1 onPreprocessing; + private final Function1, Unit> onProgress; + /* JADX DEBUG: Multi-variable search result rejected for r10v0, resolved type: java.util.List> */ + /* JADX DEBUG: Multi-variable search result rejected for r11v0, resolved type: kotlin.jvm.functions.Function1 */ + /* JADX DEBUG: Multi-variable search result rejected for r12v0, resolved type: kotlin.jvm.functions.Function1, kotlin.Unit> */ + /* JADX WARN: Multi-variable type inference failed */ /* JADX WARNING: Illegal instructions before constructor call */ - public SendApplicationCommand(com.discord.api.message.Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData, Function2 function2, long j) { + public SendApplicationCommand(com.discord.api.message.Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData, List> list, Function1 function1, Function1, Unit> function12, Function2 function2, long j) { super(r0 == null ? String.valueOf(applicationCommandLocalSendData.getNonce()) : r0, function2, j, null); m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(applicationCommandLocalSendData, "applicationCommandSendData"); + m.checkNotNullParameter(function1, "onPreprocessing"); + m.checkNotNullParameter(function12, "onProgress"); m.checkNotNullParameter(function2, "onCompleted"); String v = message.v(); this.message = message; this.applicationCommandSendData = applicationCommandLocalSendData; + this.attachments = list; + this.onPreprocessing = function1; + this.onProgress = function12; } public final ApplicationCommandLocalSendData getApplicationCommandSendData() { return this.applicationCommandSendData; } + public final List> getAttachments() { + return this.attachments; + } + public final com.discord.api.message.Message getMessage() { return this.message; } + + public final Function1 getOnPreprocessing() { + return this.onPreprocessing; + } + + public final Function1, Unit> getOnProgress() { + return this.onProgress; + } } /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlin.jvm.functions.Function2 */ 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 28a6c39cd7..2d19aeb591 100644 --- a/app/src/main/java/com/discord/utilities/rest/RestAPI.java +++ b/app/src/main/java/com/discord/utilities/rest/RestAPI.java @@ -1768,7 +1768,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.p()) : null); + pairArr[1] = d0.o.to("location_guild_id", guild != null ? Long.valueOf(guild.q()) : null); Channel channel = modelInvite.getChannel(); pairArr[2] = d0.o.to("location_channel_id", channel != null ? Long.valueOf(channel.h()) : null); Channel channel2 = modelInvite.getChannel(); @@ -1987,6 +1987,15 @@ public final class RestAPI implements RestAPIInterface { return this._api.searchServers(j, str); } + @Override // com.discord.restapi.RestAPIInterface + @o("interactions") + @l + public Observable sendApplicationCommand(@q("payload_json") PayloadJSON payloadJSON, @q MultipartBody.Part[] partArr) { + m.checkNotNullParameter(payloadJSON, "payloadJson"); + m.checkNotNullParameter(partArr, ChatInputComponentTypes.FILES); + return this._api.sendApplicationCommand(payloadJSON, partArr); + } + @Override // com.discord.restapi.RestAPIInterface @o("interactions") public Observable sendApplicationCommand(@i0.f0.a RestAPIParams.ApplicationCommand applicationCommand) { diff --git a/app/src/main/java/com/discord/utilities/rest/SendUtils$compressImageAttachments$1.java b/app/src/main/java/com/discord/utilities/rest/SendUtils$compressImageAttachments$1.java index d83b91f3d7..d59bd9dbf5 100644 --- a/app/src/main/java/com/discord/utilities/rest/SendUtils$compressImageAttachments$1.java +++ b/app/src/main/java/com/discord/utilities/rest/SendUtils$compressImageAttachments$1.java @@ -26,7 +26,7 @@ import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; import s.a.j0; /* compiled from: SendUtils.kt */ -@e(c = "com.discord.utilities.rest.SendUtils$compressImageAttachments$1", f = "SendUtils.kt", l = {249}, m = "invokeSuspend") +@e(c = "com.discord.utilities.rest.SendUtils$compressImageAttachments$1", f = "SendUtils.kt", l = {300}, m = "invokeSuspend") public final class SendUtils$compressImageAttachments$1 extends k implements Function2, Object> { public final /* synthetic */ List $attachments; public final /* synthetic */ Context $context; diff --git a/app/src/main/java/com/discord/utilities/rest/SendUtils$getSendCommandPayload$2.java b/app/src/main/java/com/discord/utilities/rest/SendUtils$getSendCommandPayload$2.java new file mode 100644 index 0000000000..0a42f85bfc --- /dev/null +++ b/app/src/main/java/com/discord/utilities/rest/SendUtils$getSendCommandPayload$2.java @@ -0,0 +1,21 @@ +package com.discord.utilities.rest; + +import com.discord.models.commands.ApplicationCommandLocalSendData; +import com.discord.utilities.rest.SendUtils; +import d0.z.d.m; +import j0.k.b; +import java.util.List; +/* compiled from: SendUtils.kt */ +public final class SendUtils$getSendCommandPayload$2 implements b, SendUtils.SendPayload.ReadyToSendCommand> { + public final /* synthetic */ ApplicationCommandLocalSendData $attachmentCorrectedMessage; + + public SendUtils$getSendCommandPayload$2(ApplicationCommandLocalSendData applicationCommandLocalSendData) { + this.$attachmentCorrectedMessage = applicationCommandLocalSendData; + } + + public final SendUtils.SendPayload.ReadyToSendCommand call(List list) { + ApplicationCommandLocalSendData applicationCommandLocalSendData = this.$attachmentCorrectedMessage; + m.checkNotNullExpressionValue(list, "attachmentParts"); + return new SendUtils.SendPayload.ReadyToSendCommand(applicationCommandLocalSendData, list); + } +} diff --git a/app/src/main/java/com/discord/utilities/rest/SendUtils$uniqueifyNames$1.java b/app/src/main/java/com/discord/utilities/rest/SendUtils$uniqueifyNames$1.java index a942ec3d4a..1db7795958 100644 --- a/app/src/main/java/com/discord/utilities/rest/SendUtils$uniqueifyNames$1.java +++ b/app/src/main/java/com/discord/utilities/rest/SendUtils$uniqueifyNames$1.java @@ -16,7 +16,7 @@ import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; /* compiled from: SendUtils.kt */ -@e(c = "com.discord.utilities.rest.SendUtils$uniqueifyNames$1", f = "SendUtils.kt", l = {147, 149}, m = "invokeSuspend") +@e(c = "com.discord.utilities.rest.SendUtils$uniqueifyNames$1", f = "SendUtils.kt", l = {198, 200}, m = "invokeSuspend") public final class SendUtils$uniqueifyNames$1 extends j implements Function2>, Continuation, Object> { public final /* synthetic */ List $attachmentParts; private /* synthetic */ Object L$0; diff --git a/app/src/main/java/com/discord/utilities/rest/SendUtils.java b/app/src/main/java/com/discord/utilities/rest/SendUtils.java index b5a0198ea8..840828b37c 100644 --- a/app/src/main/java/com/discord/utilities/rest/SendUtils.java +++ b/app/src/main/java/com/discord/utilities/rest/SendUtils.java @@ -9,10 +9,13 @@ import androidx.annotation.VisibleForTesting; import c.d.b.a.a; import c.i.a.f.e.o.f; import com.discord.R; +import com.discord.api.commands.ApplicationCommandType; +import com.discord.models.commands.ApplicationCommandLocalSendData; import com.discord.models.domain.ModelAuditLogEntry; import com.discord.restapi.RestAPIParams; import com.discord.utilities.attachments.AttachmentUtilsKt; import com.discord.utilities.error.Error; +import com.discord.widgets.chat.input.models.ApplicationCommandValue; import com.lytefast.flexinput.model.Attachment; import d0.f0.l; import d0.g0.w; @@ -22,7 +25,9 @@ import d0.z.d.m; import j0.l.a.q; import j0.l.e.j; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; +import java.util.NoSuchElementException; import java.util.Objects; import kotlin.Pair; import kotlin.Unit; @@ -353,6 +358,84 @@ public final class SendUtils { } } + /* compiled from: SendUtils.kt */ + public static final class ReadyToSendCommand extends SendPayload { + private final ApplicationCommandLocalSendData command; + private final List uploads; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public ReadyToSendCommand(ApplicationCommandLocalSendData applicationCommandLocalSendData, List list) { + super(null); + m.checkNotNullParameter(applicationCommandLocalSendData, "command"); + m.checkNotNullParameter(list, "uploads"); + this.command = applicationCommandLocalSendData; + this.uploads = list; + } + + /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.rest.SendUtils$SendPayload$ReadyToSendCommand */ + /* JADX WARN: Multi-variable type inference failed */ + public static /* synthetic */ ReadyToSendCommand copy$default(ReadyToSendCommand readyToSendCommand, ApplicationCommandLocalSendData applicationCommandLocalSendData, List list, int i, Object obj) { + if ((i & 1) != 0) { + applicationCommandLocalSendData = readyToSendCommand.command; + } + if ((i & 2) != 0) { + list = readyToSendCommand.uploads; + } + return readyToSendCommand.copy(applicationCommandLocalSendData, list); + } + + public final ApplicationCommandLocalSendData component1() { + return this.command; + } + + public final List component2() { + return this.uploads; + } + + public final ReadyToSendCommand copy(ApplicationCommandLocalSendData applicationCommandLocalSendData, List list) { + m.checkNotNullParameter(applicationCommandLocalSendData, "command"); + m.checkNotNullParameter(list, "uploads"); + return new ReadyToSendCommand(applicationCommandLocalSendData, list); + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof ReadyToSendCommand)) { + return false; + } + ReadyToSendCommand readyToSendCommand = (ReadyToSendCommand) obj; + return m.areEqual(this.command, readyToSendCommand.command) && m.areEqual(this.uploads, readyToSendCommand.uploads); + } + + public final ApplicationCommandLocalSendData getCommand() { + return this.command; + } + + public final List getUploads() { + return this.uploads; + } + + public int hashCode() { + ApplicationCommandLocalSendData applicationCommandLocalSendData = this.command; + int i = 0; + int hashCode = (applicationCommandLocalSendData != null ? applicationCommandLocalSendData.hashCode() : 0) * 31; + List list = this.uploads; + if (list != null) { + i = list.hashCode(); + } + return hashCode + i; + } + + public String toString() { + StringBuilder R = a.R("ReadyToSendCommand(command="); + R.append(this.command); + R.append(", uploads="); + return a.J(R, this.uploads, ")"); + } + } + private SendPayload() { } @@ -368,6 +451,14 @@ public final class SendUtils { return Observable.n(new SendUtils$getPart$1(attachment, str, contentResolver), Emitter.BackpressureMode.BUFFER); } + private final SendPayload.Preprocessing getPreprocessingFromAttachments(ContentResolver contentResolver, List> list) { + if (list.size() != 1) { + return new SendPayload.Preprocessing(list.size(), null, null); + } + Attachment attachment = (Attachment) u.first((List) list); + return new SendPayload.Preprocessing(1, Attachment.Companion.a(attachment), AttachmentUtilsKt.getMimeType(contentResolver, attachment.getUri(), attachment.getDisplayName())); + } + /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: com.discord.utilities.rest.SendUtils */ /* JADX WARN: Multi-variable type inference failed */ public static /* synthetic */ void handleSendError$default(SendUtils sendUtils, Error error, Context context, Function0 function0, Function0 function02, int i, Object obj) { @@ -402,8 +493,53 @@ public final class SendUtils { f.x0(w0Var, n.b, null, new SendUtils$compressImageAttachments$1(list, context, function1, null), 2, null); } + public final Observable getSendCommandPayload(ContentResolver contentResolver, ApplicationCommandLocalSendData applicationCommandLocalSendData, List> list) { + m.checkNotNullParameter(contentResolver, "contentResolver"); + m.checkNotNullParameter(applicationCommandLocalSendData, "apiParamMessage"); + if (list != null) { + List> uniqueifyNames = uniqueifyNames(list); + List applicationCommandsValues = applicationCommandLocalSendData.getApplicationCommandsValues(); + ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(applicationCommandsValues, 10)); + for (ApplicationCommandValue applicationCommandValue : applicationCommandsValues) { + if (applicationCommandValue.getType() == ApplicationCommandType.ATTACHMENT.getType()) { + Iterator it = uniqueifyNames.iterator(); + while (it.hasNext()) { + Attachment attachment = (Attachment) it.next(); + if (m.areEqual(attachment.getUri().toString(), applicationCommandValue.getValue())) { + applicationCommandValue = ApplicationCommandValue.copy$default(applicationCommandValue, null, attachment.getDisplayName(), 0, null, null, 29, null); + } + } + throw new NoSuchElementException("Collection contains no element matching the predicate."); + } + arrayList.add(applicationCommandValue); + } + ApplicationCommandLocalSendData copy$default = ApplicationCommandLocalSendData.copy$default(applicationCommandLocalSendData, 0, 0, null, null, null, null, null, arrayList, null, null, 895, null); + if (!uniqueifyNames.isEmpty()) { + j jVar = new j(getPreprocessingFromAttachments(contentResolver, uniqueifyNames)); + ArrayList arrayList2 = new ArrayList(d0.t.o.collectionSizeOrDefault(uniqueifyNames, 10)); + int i = 0; + for (Object obj : uniqueifyNames) { + int i2 = i + 1; + if (i < 0) { + d0.t.n.throwIndexOverflow(); + } + arrayList2.add(INSTANCE.getPart((Attachment) obj, contentResolver, a.p("file", i))); + i = i2; + } + Observable m = Observable.m(jVar, Observable.l(Observable.h0(new q(arrayList2))).f0().F(new SendUtils$getSendCommandPayload$2(copy$default))); + m.checkNotNullExpressionValue(m, "Observable.concat(\n …)\n }\n )"); + return m; + } + j jVar2 = new j(new SendPayload.ReadyToSendCommand(copy$default, d0.t.n.emptyList())); + m.checkNotNullExpressionValue(jVar2, "Observable.just(SendPayl…tedMessage, emptyList()))"); + return jVar2; + } + j jVar3 = new j(new SendPayload.ReadyToSendCommand(applicationCommandLocalSendData, d0.t.n.emptyList())); + m.checkNotNullExpressionValue(jVar3, "Observable.just(SendPayl…ramMessage, emptyList()))"); + return jVar3; + } + public final Observable getSendPayload(ContentResolver contentResolver, RestAPIParams.Message message, List> list) { - SendPayload.Preprocessing preprocessing; RestAPIParams.Message message2 = message; m.checkNotNullParameter(contentResolver, "contentResolver"); m.checkNotNullParameter(message2, "apiParamMessage"); @@ -423,14 +559,7 @@ public final class SendUtils { } List> uniqueifyNames = uniqueifyNames(u.minus((Iterable) list, (Iterable) extractLinks)); if (!uniqueifyNames.isEmpty()) { - if (uniqueifyNames.size() != 1) { - preprocessing = new SendPayload.Preprocessing(uniqueifyNames.size(), null, null); - } else { - Attachment attachment = (Attachment) u.first((List) uniqueifyNames); - String a = Attachment.Companion.a(attachment); - preprocessing = new SendPayload.Preprocessing(1, a, AttachmentUtilsKt.getMimeType(contentResolver, attachment.getUri(), a)); - } - j jVar2 = new j(preprocessing); + j jVar2 = new j(getPreprocessingFromAttachments(contentResolver, uniqueifyNames)); ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(uniqueifyNames, 10)); int i = 0; for (Object obj : uniqueifyNames) { 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 752f8edeca..a3aad3c3f2 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.f1706c; m.checkNotNullExpressionValue(textView2, "binding.authInviteInfoGuildName"); - textView2.setText(guild.v()); + textView2.setText(guild.w()); return; } return; diff --git a/app/src/main/java/com/discord/widgets/chat/MessageManager$sendCommand$1.java b/app/src/main/java/com/discord/widgets/chat/MessageManager$sendCommand$1.java new file mode 100644 index 0000000000..66482c6a76 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/chat/MessageManager$sendCommand$1.java @@ -0,0 +1,18 @@ +package com.discord.widgets.chat; + +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: MessageManager.kt */ +public final class MessageManager$sendCommand$1 extends o implements Function0 { + public static final MessageManager$sendCommand$1 INSTANCE = new MessageManager$sendCommand$1(); + + public MessageManager$sendCommand$1() { + super(0); + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + } +} diff --git a/app/src/main/java/com/discord/widgets/chat/MessageManager$sendCommand$2.java b/app/src/main/java/com/discord/widgets/chat/MessageManager$sendCommand$2.java new file mode 100644 index 0000000000..ba015c2992 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/chat/MessageManager$sendCommand$2.java @@ -0,0 +1,27 @@ +package com.discord.widgets.chat; + +import com.discord.utilities.error.Error; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: MessageManager.kt */ +public final class MessageManager$sendCommand$2 extends o implements Function1 { + public static final MessageManager$sendCommand$2 INSTANCE = new MessageManager$sendCommand$2(); + + public MessageManager$sendCommand$2() { + super(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 // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "it"); + } +} diff --git a/app/src/main/java/com/discord/widgets/chat/MessageManager.java b/app/src/main/java/com/discord/widgets/chat/MessageManager.java index 7f07d77585..82f771678c 100644 --- a/app/src/main/java/com/discord/widgets/chat/MessageManager.java +++ b/app/src/main/java/com/discord/widgets/chat/MessageManager.java @@ -14,6 +14,7 @@ import com.discord.api.user.User; import com.discord.models.guild.Guild; import com.discord.models.message.Message; import com.discord.models.user.MeUser; +import com.discord.stores.StoreApplicationInteractions; import com.discord.stores.StoreChannelsSelected; import com.discord.stores.StoreGuilds; import com.discord.stores.StoreMessageReplies; @@ -22,10 +23,12 @@ import com.discord.stores.StorePendingReplies; import com.discord.stores.StoreSlowMode; import com.discord.stores.StoreStream; import com.discord.stores.StoreUser; +import com.discord.utilities.error.Error; import com.discord.utilities.messagesend.MessageResult; import com.discord.utilities.rest.SendUtils; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.user.UserUtils; +import com.discord.widgets.chat.input.models.ApplicationCommandData; import com.lytefast.flexinput.model.Attachment; import d0.t.k; import d0.t.n; @@ -45,6 +48,7 @@ import rx.Observable; public final class MessageManager { private final Context context; private final Function1 defaultMessageResultHandler; + private final StoreApplicationInteractions storeApplicationInteractions; private final StoreChannelsSelected storeChannelsSelected; private final StoreGuilds storeGuilds; private final StoreMessageReplies storeMessageReplies; @@ -315,9 +319,10 @@ public final class MessageManager { } } - public MessageManager(Context context, StoreMessages storeMessages, StoreUser storeUser, StoreChannelsSelected storeChannelsSelected, StoreSlowMode storeSlowMode, StoreGuilds storeGuilds, StorePendingReplies storePendingReplies, StoreMessageReplies storeMessageReplies) { + public MessageManager(Context context, StoreMessages storeMessages, StoreApplicationInteractions storeApplicationInteractions, StoreUser storeUser, StoreChannelsSelected storeChannelsSelected, StoreSlowMode storeSlowMode, StoreGuilds storeGuilds, StorePendingReplies storePendingReplies, StoreMessageReplies storeMessageReplies) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(storeMessages, "storeMessages"); + m.checkNotNullParameter(storeApplicationInteractions, "storeApplicationInteractions"); m.checkNotNullParameter(storeUser, "storeUser"); m.checkNotNullParameter(storeChannelsSelected, "storeChannelsSelected"); m.checkNotNullParameter(storeSlowMode, "storeSlowMode"); @@ -326,6 +331,7 @@ public final class MessageManager { m.checkNotNullParameter(storeMessageReplies, "storeMessageReplies"); this.context = context; this.storeMessages = storeMessages; + this.storeApplicationInteractions = storeApplicationInteractions; this.storeUser = storeUser; this.storeChannelsSelected = storeChannelsSelected; this.storeSlowMode = storeSlowMode; @@ -336,8 +342,8 @@ public final class MessageManager { } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ MessageManager(Context context, StoreMessages storeMessages, StoreUser storeUser, StoreChannelsSelected storeChannelsSelected, StoreSlowMode storeSlowMode, StoreGuilds storeGuilds, StorePendingReplies storePendingReplies, StoreMessageReplies storeMessageReplies, int i, DefaultConstructorMarker defaultConstructorMarker) { - this(context, (i & 2) != 0 ? StoreStream.Companion.getMessages() : storeMessages, (i & 4) != 0 ? StoreStream.Companion.getUsers() : storeUser, (i & 8) != 0 ? StoreStream.Companion.getChannelsSelected() : storeChannelsSelected, (i & 16) != 0 ? StoreStream.Companion.getSlowMode() : storeSlowMode, (i & 32) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds, (i & 64) != 0 ? StoreStream.Companion.getPendingReplies() : storePendingReplies, (i & 128) != 0 ? StoreStream.Companion.getRepliedMessages() : storeMessageReplies); + public /* synthetic */ MessageManager(Context context, StoreMessages storeMessages, StoreApplicationInteractions storeApplicationInteractions, StoreUser storeUser, StoreChannelsSelected storeChannelsSelected, StoreSlowMode storeSlowMode, StoreGuilds storeGuilds, StorePendingReplies storePendingReplies, StoreMessageReplies storeMessageReplies, int i, DefaultConstructorMarker defaultConstructorMarker) { + this(context, (i & 2) != 0 ? StoreStream.Companion.getMessages() : storeMessages, (i & 4) != 0 ? StoreStream.Companion.getInteractions() : storeApplicationInteractions, (i & 8) != 0 ? StoreStream.Companion.getUsers() : storeUser, (i & 16) != 0 ? StoreStream.Companion.getChannelsSelected() : storeChannelsSelected, (i & 32) != 0 ? StoreStream.Companion.getSlowMode() : storeSlowMode, (i & 64) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds, (i & 128) != 0 ? StoreStream.Companion.getPendingReplies() : storePendingReplies, (i & 256) != 0 ? StoreStream.Companion.getRepliedMessages() : storeMessageReplies); } public static final /* synthetic */ Context access$getContext$p(MessageManager messageManager) { @@ -400,6 +406,10 @@ public final class MessageManager { return null; } + public static /* synthetic */ boolean sendCommand$default(MessageManager messageManager, long j, Long l, String str, ApplicationCommandData applicationCommandData, AttachmentsRequest attachmentsRequest, Function0 function0, Function1 function1, Function2 function2, int i, Object obj) { + return messageManager.sendCommand(j, l, str, applicationCommandData, (i & 16) != 0 ? null : attachmentsRequest, function0, function1, (i & 128) != 0 ? null : function2); + } + public static /* synthetic */ boolean sendMessage$default(MessageManager messageManager, String str, List list, AttachmentsRequest attachmentsRequest, Long l, List list2, boolean z2, Function2 function2, Function2 function22, Function1 function1, int i, Object obj) { String str2 = (i & 1) != 0 ? "" : str; Function2 function23 = null; @@ -465,6 +475,24 @@ public final class MessageManager { } } + public final boolean sendCommand(long j, Long l, String str, ApplicationCommandData applicationCommandData, AttachmentsRequest attachmentsRequest, Function0 function0, Function1 function1, Function2 function2) { + m.checkNotNullParameter(applicationCommandData, "data"); + m.checkNotNullParameter(function0, "onSuccess"); + m.checkNotNullParameter(function1, "onFail"); + MeUser me2 = this.storeUser.getMe(); + AttachmentValidationResult validateAttachments = validateAttachments(attachmentsRequest); + if (validateAttachments instanceof AttachmentValidationResult.FilesTooLarge) { + AttachmentsRequest attachmentsRequest2 = ((AttachmentValidationResult.FilesTooLarge) validateAttachments).getAttachmentsRequest(); + if (function2 == null) { + return false; + } + function2.invoke(Integer.valueOf(attachmentsRequest2.getMaxFileSizeMB()), Boolean.valueOf(UserUtils.INSTANCE.isPremium(me2))); + return false; + } + this.storeApplicationInteractions.sendApplicationCommand(j, l, str, applicationCommandData, attachmentsRequest != null ? attachmentsRequest.getAttachments() : null, MessageManager$sendCommand$1.INSTANCE, MessageManager$sendCommand$2.INSTANCE); + return true; + } + public final boolean sendMessage(String str, List list, AttachmentsRequest attachmentsRequest, Long l, List list2, boolean z2, Function2 function2, Function2 function22, Function1 function1) { ShortcutManager shortcutManager; m.checkNotNullParameter(str, "content"); diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$createAndGotoThread$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$createAndGotoThread$1.java new file mode 100644 index 0000000000..2caf5b8c69 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$createAndGotoThread$1.java @@ -0,0 +1,23 @@ +package com.discord.widgets.chat.input; + +import com.discord.api.channel.Channel; +import com.discord.utilities.rx.ObservableExtensionsKt; +import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1; +import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$2; +import d0.z.d.m; +import j0.k.b; +import rx.Observable; +/* compiled from: ChatInputViewModel.kt */ +public final class ChatInputViewModel$createAndGotoThread$1 implements b> { + public final /* synthetic */ ChatInputViewModel this$0; + + public ChatInputViewModel$createAndGotoThread$1(ChatInputViewModel chatInputViewModel) { + this.this$0 = chatInputViewModel; + } + + public final Observable call(Channel channel) { + Observable F = ChatInputViewModel.access$getStoreChannels$p(this.this$0).observeChannel(channel.h()).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE); + m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }"); + return ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(F, 0, false, 3, null)); + } +} diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$createAndGotoThread$2.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$createAndGotoThread$2.java new file mode 100644 index 0000000000..ed08b9ccc3 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$createAndGotoThread$2.java @@ -0,0 +1,40 @@ +package com.discord.widgets.chat.input; + +import com.discord.api.channel.Channel; +import com.discord.stores.StoreStream; +import com.discord.utilities.channel.ChannelSelector; +import com.discord.widgets.chat.input.ChatInputViewModel; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: ChatInputViewModel.kt */ +public final class ChatInputViewModel$createAndGotoThread$2 extends o implements Function1 { + public final /* synthetic */ ChatInputViewModel.ViewState.Loaded $loadedViewState; + public final /* synthetic */ Function1 $onThreadCreated; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public ChatInputViewModel$createAndGotoThread$2(ChatInputViewModel.ViewState.Loaded loaded, Function1 function1) { + super(1); + this.$loadedViewState = loaded; + this.$onThreadCreated = function1; + } + + /* 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(Channel channel) { + invoke(channel); + return Unit.a; + } + + public final void invoke(Channel channel) { + if (channel != null) { + StoreStream.Companion.getSlowMode().onThreadCreated(this.$loadedViewState.getChannelId()); + Function1 function1 = this.$onThreadCreated; + if (function1 != null) { + function1.invoke(channel); + } + ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), channel, null, null, 6, null); + } + } +} diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$createAndGotoThread$3.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$createAndGotoThread$3.java new file mode 100644 index 0000000000..7adb2824ae --- /dev/null +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$createAndGotoThread$3.java @@ -0,0 +1,53 @@ +package com.discord.widgets.chat.input; + +import android.content.Context; +import com.discord.R; +import com.discord.stores.StoreSlowMode; +import com.discord.stores.StoreStream; +import com.discord.utilities.error.Error; +import com.discord.utilities.rest.RestAPIAbortMessages; +import com.discord.widgets.chat.input.ChatInputViewModel; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: ChatInputViewModel.kt */ +public final class ChatInputViewModel$createAndGotoThread$3 extends o implements Function1 { + public final /* synthetic */ Context $context; + public final /* synthetic */ ChatInputViewModel.ViewState.Loaded $loadedViewState; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public ChatInputViewModel$createAndGotoThread$3(ChatInputViewModel.ViewState.Loaded loaded, Context context) { + super(1); + this.$loadedViewState = loaded; + this.$context = context; + } + + /* 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(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "error"); + Error.Response response = error.getResponse(); + m.checkNotNullExpressionValue(response, "error.response"); + Integer abortCodeMessageResId = RestAPIAbortMessages.getAbortCodeMessageResId(response.getCode()); + Error.Response response2 = error.getResponse(); + m.checkNotNullExpressionValue(response2, "error.response"); + if (response2.getCode() == 20016) { + Error.Response response3 = error.getResponse(); + m.checkNotNullExpressionValue(response3, "error.response"); + Long retryAfterMs = response3.getRetryAfterMs(); + if (retryAfterMs == null) { + retryAfterMs = 0L; + } + m.checkNotNullExpressionValue(retryAfterMs, "error.response.retryAfterMs ?: 0"); + StoreStream.Companion.getSlowMode().onCooldown(this.$loadedViewState.getChannelId(), retryAfterMs.longValue(), StoreSlowMode.Type.ThreadCreate.INSTANCE); + } + c.a.d.m.g(this.$context, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : R.string.network_error_bad_request, 0, null, 12); + } +} diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$1.java index d75cb22015..af2ef5ced2 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$1.java @@ -2,17 +2,23 @@ package com.discord.widgets.chat.input; import d0.z.d.o; import kotlin.Unit; -import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; /* compiled from: ChatInputViewModel.kt */ -public final class ChatInputViewModel$sendCommand$1 extends o implements Function0 { +public final class ChatInputViewModel$sendCommand$1 extends o implements Function1 { public static final ChatInputViewModel$sendCommand$1 INSTANCE = new ChatInputViewModel$sendCommand$1(); public ChatInputViewModel$sendCommand$1() { - super(0); + super(1); } - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final void mo1invoke() { + /* 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(Boolean bool) { + invoke(bool.booleanValue()); + return Unit.a; + } + + public final void invoke(boolean z2) { } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$commandResendCompressedHandler$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$commandResendCompressedHandler$1.java new file mode 100644 index 0000000000..18580dbc98 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$commandResendCompressedHandler$1.java @@ -0,0 +1,66 @@ +package com.discord.widgets.chat.input; + +import android.content.Context; +import com.discord.utilities.rest.SendUtils; +import com.discord.widgets.chat.MessageManager; +import com.discord.widgets.chat.input.ChatInputViewModel; +import com.discord.widgets.chat.input.models.ApplicationCommandData; +import com.lytefast.flexinput.model.Attachment; +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: ChatInputViewModel.kt */ +public final class ChatInputViewModel$sendCommand$commandResendCompressedHandler$1 extends o implements Function0 { + public final /* synthetic */ ApplicationCommandData $applicationCommandData; + public final /* synthetic */ ChatInputViewModel.AttachmentContext $attachmentsContext; + public final /* synthetic */ boolean $autocomplete; + public final /* synthetic */ Context $context; + public final /* synthetic */ MessageManager $messageManager; + public final /* synthetic */ ChatInputViewModel this$0; + + /* compiled from: ChatInputViewModel.kt */ + /* renamed from: com.discord.widgets.chat.input.ChatInputViewModel$sendCommand$commandResendCompressedHandler$1$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function1>, Unit> { + public final /* synthetic */ ChatInputViewModel$sendCommand$commandResendCompressedHandler$1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(ChatInputViewModel$sendCommand$commandResendCompressedHandler$1 chatInputViewModel$sendCommand$commandResendCompressedHandler$1) { + super(1); + this.this$0 = chatInputViewModel$sendCommand$commandResendCompressedHandler$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 // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(List> list) { + invoke(list); + return Unit.a; + } + + public final void invoke(List> list) { + m.checkNotNullParameter(list, "compressedAttachments"); + ChatInputViewModel$sendCommand$commandResendCompressedHandler$1 chatInputViewModel$sendCommand$commandResendCompressedHandler$1 = this.this$0; + ChatInputViewModel.sendCommand$default(chatInputViewModel$sendCommand$commandResendCompressedHandler$1.this$0, chatInputViewModel$sendCommand$commandResendCompressedHandler$1.$context, chatInputViewModel$sendCommand$commandResendCompressedHandler$1.$messageManager, chatInputViewModel$sendCommand$commandResendCompressedHandler$1.$applicationCommandData, list, chatInputViewModel$sendCommand$commandResendCompressedHandler$1.$autocomplete, true, null, 64, null); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public ChatInputViewModel$sendCommand$commandResendCompressedHandler$1(ChatInputViewModel chatInputViewModel, Context context, ChatInputViewModel.AttachmentContext attachmentContext, MessageManager messageManager, ApplicationCommandData applicationCommandData, boolean z2) { + super(0); + this.this$0 = chatInputViewModel; + this.$context = context; + this.$attachmentsContext = attachmentContext; + this.$messageManager = messageManager; + this.$applicationCommandData = applicationCommandData; + this.$autocomplete = z2; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + SendUtils.INSTANCE.compressImageAttachments(this.$context, this.$attachmentsContext.getAttachments(), new AnonymousClass1(this)); + } +} diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$validated$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$validated$1.java new file mode 100644 index 0000000000..8e96fce516 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$validated$1.java @@ -0,0 +1,18 @@ +package com.discord.widgets.chat.input; + +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: ChatInputViewModel.kt */ +public final class ChatInputViewModel$sendCommand$validated$1 extends o implements Function0 { + public static final ChatInputViewModel$sendCommand$validated$1 INSTANCE = new ChatInputViewModel$sendCommand$validated$1(); + + public ChatInputViewModel$sendCommand$validated$1() { + super(0); + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + } +} diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$2.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$validated$2.java similarity index 70% rename from app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$2.java rename to app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$validated$2.java index 8d9e797f40..9a6b521944 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$validated$2.java @@ -6,10 +6,10 @@ import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: ChatInputViewModel.kt */ -public final class ChatInputViewModel$sendCommand$2 extends o implements Function1 { - public static final ChatInputViewModel$sendCommand$2 INSTANCE = new ChatInputViewModel$sendCommand$2(); +public final class ChatInputViewModel$sendCommand$validated$2 extends o implements Function1 { + public static final ChatInputViewModel$sendCommand$validated$2 INSTANCE = new ChatInputViewModel$sendCommand$validated$2(); - public ChatInputViewModel$sendCommand$2() { + public ChatInputViewModel$sendCommand$validated$2() { super(1); } diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$validated$3.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$validated$3.java new file mode 100644 index 0000000000..3a9e682c54 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendCommand$validated$3.java @@ -0,0 +1,35 @@ +package com.discord.widgets.chat.input; + +import com.discord.widgets.chat.input.ChatInputViewModel; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function2; +import rx.subjects.PublishSubject; +/* compiled from: ChatInputViewModel.kt */ +public final class ChatInputViewModel$sendCommand$validated$3 extends o implements Function2 { + public final /* synthetic */ ChatInputViewModel.AttachmentContext $attachmentsContext; + public final /* synthetic */ Function0 $commandResendCompressedHandler; + public final /* synthetic */ ChatInputViewModel this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public ChatInputViewModel$sendCommand$validated$3(ChatInputViewModel chatInputViewModel, ChatInputViewModel.AttachmentContext attachmentContext, Function0 function0) { + super(2); + this.this$0 = chatInputViewModel; + this.$attachmentsContext = attachmentContext; + this.$commandResendCompressedHandler = function0; + } + + /* 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] */ + @Override // kotlin.jvm.functions.Function2 + public /* bridge */ /* synthetic */ Unit invoke(Integer num, Boolean bool) { + invoke(num.intValue(), bool.booleanValue()); + return Unit.a; + } + + public final void invoke(int i, boolean z2) { + PublishSubject access$getEventSubject$p = ChatInputViewModel.access$getEventSubject$p(this.this$0); + access$getEventSubject$p.j.onNext(new ChatInputViewModel.Event.FilesTooLarge(i, this.$attachmentsContext.getCurrentFileSizeMB(), this.$attachmentsContext.getMaxAttachmentSizeMB(), z2, this.$attachmentsContext.getAttachments(), this.$attachmentsContext.getHasImage(), this.$attachmentsContext.getHasVideo(), this.$attachmentsContext.getHasGif(), this.$commandResendCompressedHandler)); + } +} diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java index c0cf7bbc0a..756dd0aa92 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java @@ -1,161 +1,30 @@ package com.discord.widgets.chat.input; -import android.content.Context; -import com.discord.R; import com.discord.api.channel.Channel; -import com.discord.api.channel.ChannelUtils; -import com.discord.stores.StoreSlowMode; -import com.discord.stores.StoreStream; -import com.discord.utilities.channel.ChannelSelector; -import com.discord.utilities.error.Error; -import com.discord.utilities.rest.RestAPIAbortMessages; -import com.discord.utilities.rx.ObservableExtensionsKt; -import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1; -import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$2; -import com.discord.utilities.threads.ThreadUtils; -import com.discord.widgets.chat.input.ChatInputViewModel; import d0.z.d.m; import d0.z.d.o; -import j0.k.b; import kotlin.Unit; -import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; -import kotlin.jvm.functions.Function3; -import rx.Observable; /* compiled from: ChatInputViewModel.kt */ -public final class ChatInputViewModel$sendMessage$1 extends o implements Function3, Unit> { - public final /* synthetic */ Context $context; - public final /* synthetic */ ChatInputViewModel.ViewState.Loaded $loadedViewState; - public final /* synthetic */ ChatInputViewModel this$0; - - /* compiled from: ChatInputViewModel.kt */ - /* renamed from: com.discord.widgets.chat.input.ChatInputViewModel$sendMessage$1$1 reason: invalid class name */ - public static final class AnonymousClass1 implements b> { - public final /* synthetic */ ChatInputViewModel$sendMessage$1 this$0; - - public AnonymousClass1(ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1) { - this.this$0 = chatInputViewModel$sendMessage$1; - } - - public final Observable call(Channel channel) { - Observable F = ChatInputViewModel.access$getStoreChannels$p(this.this$0.this$0).observeChannel(channel.h()).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE); - m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }"); - return ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(F, 0, false, 3, null)); - } - } - - /* compiled from: ChatInputViewModel.kt */ - /* renamed from: com.discord.widgets.chat.input.ChatInputViewModel$sendMessage$1$2 reason: invalid class name */ - public static final class AnonymousClass2 extends o implements Function1 { - public final /* synthetic */ Function1 $onThreadCreated; - public final /* synthetic */ ChatInputViewModel$sendMessage$1 this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass2(ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1, Function1 function1) { - super(1); - this.this$0 = chatInputViewModel$sendMessage$1; - this.$onThreadCreated = function1; - } - - /* 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(Channel channel) { - invoke(channel); - return Unit.a; - } - - public final void invoke(Channel channel) { - if (channel != null) { - StoreStream.Companion.getSlowMode().onThreadCreated(this.this$0.$loadedViewState.getChannelId()); - Function1 function1 = this.$onThreadCreated; - if (function1 != null) { - function1.invoke(channel); - } - ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), channel, null, null, 6, null); - } - } - } - - /* compiled from: ChatInputViewModel.kt */ - /* renamed from: com.discord.widgets.chat.input.ChatInputViewModel$sendMessage$1$3 reason: invalid class name */ - public static final class AnonymousClass3 extends o implements Function1 { - public final /* synthetic */ ChatInputViewModel$sendMessage$1 this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass3(ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1) { - super(1); - this.this$0 = chatInputViewModel$sendMessage$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 // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(Error error) { - invoke(error); - return Unit.a; - } - - public final void invoke(Error error) { - m.checkNotNullParameter(error, "error"); - Error.Response response = error.getResponse(); - m.checkNotNullExpressionValue(response, "error.response"); - Integer abortCodeMessageResId = RestAPIAbortMessages.getAbortCodeMessageResId(response.getCode()); - Error.Response response2 = error.getResponse(); - m.checkNotNullExpressionValue(response2, "error.response"); - if (response2.getCode() == 20016) { - Error.Response response3 = error.getResponse(); - m.checkNotNullExpressionValue(response3, "error.response"); - Long retryAfterMs = response3.getRetryAfterMs(); - if (retryAfterMs == null) { - retryAfterMs = 0L; - } - m.checkNotNullExpressionValue(retryAfterMs, "error.response.retryAfterMs ?: 0"); - StoreStream.Companion.getSlowMode().onCooldown(this.this$0.$loadedViewState.getChannelId(), retryAfterMs.longValue(), StoreSlowMode.Type.ThreadCreate.INSTANCE); - } - c.a.d.m.g(this.this$0.$context, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : R.string.network_error_bad_request, 0, null, 12); - } - } +public final class ChatInputViewModel$sendMessage$1 extends o implements Function1 { + public final /* synthetic */ Function1 $sendMessage; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public ChatInputViewModel$sendMessage$1(ChatInputViewModel chatInputViewModel, ChatInputViewModel.ViewState.Loaded loaded, Context context) { - super(3); - this.this$0 = chatInputViewModel; - this.$loadedViewState = loaded; - this.$context = context; - } - - /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.ChatInputViewModel$sendMessage$1 */ - /* JADX WARN: Multi-variable type inference failed */ - public static /* synthetic */ void invoke$default(ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1, Long l, String str, Function1 function1, int i, Object obj) { - if ((i & 4) != 0) { - function1 = null; - } - chatInputViewModel$sendMessage$1.invoke(l, str, (Function1) function1); + public ChatInputViewModel$sendMessage$1(Function1 function1) { + super(1); + this.$sendMessage = function1; } /* 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] */ - @Override // kotlin.jvm.functions.Function3 - public /* bridge */ /* synthetic */ Unit invoke(Long l, String str, Function1 function1) { - invoke(l, str, (Function1) function1); + /* 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(Channel channel) { + invoke(channel); return Unit.a; } - public final void invoke(Long l, String str, Function1 function1) { - ThreadUtils threadUtils = ThreadUtils.INSTANCE; - long channelId = this.$loadedViewState.getChannelId(); - int i = ChannelUtils.i(this.$loadedViewState.getChannel()) ? 10 : this.$loadedViewState.getThreadDraftState().isPrivate() ? 12 : 11; - String threadName = this.$loadedViewState.getThreadDraftState().getThreadName(); - if (threadName == null) { - threadName = ""; - } - Integer autoArchiveDuration = this.$loadedViewState.getThreadDraftState().getAutoArchiveDuration(); - if (autoArchiveDuration == null) { - autoArchiveDuration = this.$loadedViewState.getChannel().d(); - } - Observable z2 = ObservableExtensionsKt.restSubscribeOn$default(threadUtils.createThread(channelId, l, i, threadName, Integer.valueOf(autoArchiveDuration != null ? autoArchiveDuration.intValue() : 1440), str), false, 1, null).z(new AnonymousClass1(this)); - m.checkNotNullExpressionValue(z2, "ThreadUtils.createThread…ationLatest()\n }"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(z2, this.this$0, null, 2, null), this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass3(this), (Function0) null, (Function0) null, new AnonymousClass2(this, function1), 54, (Object) null); + public final void invoke(Channel channel) { + m.checkNotNullParameter(channel, "thread"); + this.$sendMessage.invoke(Long.valueOf(channel.h())); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$2.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$2.java deleted file mode 100644 index 0e65658636..0000000000 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$2.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.discord.widgets.chat.input; - -import com.discord.api.channel.Channel; -import d0.z.d.m; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -/* compiled from: ChatInputViewModel.kt */ -public final class ChatInputViewModel$sendMessage$2 extends o implements Function1 { - public final /* synthetic */ Function1 $sendMessage; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public ChatInputViewModel$sendMessage$2(Function1 function1) { - super(1); - this.$sendMessage = function1; - } - - /* 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(Channel channel) { - invoke(channel); - return Unit.a; - } - - public final void invoke(Channel channel) { - m.checkNotNullParameter(channel, "thread"); - this.$sendMessage.invoke(Long.valueOf(channel.h())); - } -} diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageResendCompressedHandler$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageResendCompressedHandler$1.java index 7f5f99faac..f4f59d4bc3 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageResendCompressedHandler$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageResendCompressedHandler$1.java @@ -4,17 +4,17 @@ import android.content.Context; import com.discord.utilities.rest.SendUtils; import com.discord.widgets.chat.MessageContent; import com.discord.widgets.chat.MessageManager; +import com.discord.widgets.chat.input.ChatInputViewModel; import com.lytefast.flexinput.model.Attachment; import d0.z.d.m; import d0.z.d.o; -import java.util.ArrayList; import java.util.List; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; /* compiled from: ChatInputViewModel.kt */ public final class ChatInputViewModel$sendMessage$messageResendCompressedHandler$1 extends o implements Function0 { - public final /* synthetic */ ArrayList $attachments; + public final /* synthetic */ ChatInputViewModel.AttachmentContext $attachmentsContext; public final /* synthetic */ Context $context; public final /* synthetic */ MessageContent $messageContent; public final /* synthetic */ MessageManager $messageManager; @@ -48,11 +48,11 @@ public final class ChatInputViewModel$sendMessage$messageResendCompressedHandler } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public ChatInputViewModel$sendMessage$messageResendCompressedHandler$1(ChatInputViewModel chatInputViewModel, Context context, ArrayList arrayList, MessageManager messageManager, MessageContent messageContent, Function1 function1) { + public ChatInputViewModel$sendMessage$messageResendCompressedHandler$1(ChatInputViewModel chatInputViewModel, Context context, ChatInputViewModel.AttachmentContext attachmentContext, MessageManager messageManager, MessageContent messageContent, Function1 function1) { super(0); this.this$0 = chatInputViewModel; this.$context = context; - this.$attachments = arrayList; + this.$attachmentsContext = attachmentContext; this.$messageManager = messageManager; this.$messageContent = messageContent; this.$onValidationResult = function1; @@ -61,6 +61,6 @@ public final class ChatInputViewModel$sendMessage$messageResendCompressedHandler @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - SendUtils.INSTANCE.compressImageAttachments(this.$context, this.$attachments, new AnonymousClass1(this)); + SendUtils.INSTANCE.compressImageAttachments(this.$context, this.$attachmentsContext.getAttachments(), new AnonymousClass1(this)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageSendResultHandler$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageSendResultHandler$1.java index 0023053cdd..1d40b70c29 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageSendResultHandler$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageSendResultHandler$1.java @@ -10,18 +10,14 @@ import com.discord.utilities.user.UserUtils; import com.discord.widgets.chat.input.ChatInputViewModel; import d0.z.d.m; import d0.z.d.o; -import java.util.ArrayList; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function2; import rx.subjects.PublishSubject; /* compiled from: ChatInputViewModel.kt */ public final class ChatInputViewModel$sendMessage$messageSendResultHandler$1 extends o implements Function2 { - public final /* synthetic */ ArrayList $attachments; + public final /* synthetic */ ChatInputViewModel.AttachmentContext $attachmentsContext; public final /* synthetic */ Context $context; - public final /* synthetic */ boolean $hasGif; - public final /* synthetic */ boolean $hasImage; - public final /* synthetic */ boolean $hasVideo; public final /* synthetic */ boolean $isThreadDraft; public final /* synthetic */ ChatInputViewModel.ViewState.Loaded $loadedViewState; public final /* synthetic */ Function0 $messageResendCompressedHandler; @@ -48,9 +44,7 @@ public final class ChatInputViewModel$sendMessage$messageSendResultHandler$1 ext int max = Math.max(premiumUtils.getGuildMaxFileSizeMB(guild != null ? guild.getPremiumTier() : 0), premiumUtils.getMaxFileSizeMB(this.this$0.$loadedViewState.getMe())); PublishSubject access$getEventSubject$p = ChatInputViewModel.access$getEventSubject$p(this.this$0.this$0); MeUser me2 = this.this$0.$loadedViewState.getMe(); - boolean isPremium = me2 != null ? UserUtils.INSTANCE.isPremium(me2) : false; - ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = this.this$0; - access$getEventSubject$p.j.onNext(new ChatInputViewModel.Event.FilesTooLarge(max, Float.MAX_VALUE, Float.MAX_VALUE, isPremium, chatInputViewModel$sendMessage$messageSendResultHandler$1.$attachments, chatInputViewModel$sendMessage$messageSendResultHandler$1.$hasImage, chatInputViewModel$sendMessage$messageSendResultHandler$1.$hasVideo, chatInputViewModel$sendMessage$messageSendResultHandler$1.$hasGif, chatInputViewModel$sendMessage$messageSendResultHandler$1.$messageResendCompressedHandler)); + access$getEventSubject$p.j.onNext(new ChatInputViewModel.Event.FilesTooLarge(max, Float.MAX_VALUE, Float.MAX_VALUE, me2 != null ? UserUtils.INSTANCE.isPremium(me2) : false, this.this$0.$attachmentsContext.getAttachments(), this.this$0.$attachmentsContext.getHasImage(), this.this$0.$attachmentsContext.getHasVideo(), this.this$0.$attachmentsContext.getHasGif(), this.this$0.$messageResendCompressedHandler)); } } @@ -74,17 +68,14 @@ public final class ChatInputViewModel$sendMessage$messageSendResultHandler$1 ext } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public ChatInputViewModel$sendMessage$messageSendResultHandler$1(ChatInputViewModel chatInputViewModel, Context context, ChatInputViewModel.ViewState.Loaded loaded, ArrayList arrayList, boolean z2, boolean z3, boolean z4, Function0 function0, boolean z5) { + public ChatInputViewModel$sendMessage$messageSendResultHandler$1(ChatInputViewModel chatInputViewModel, Context context, ChatInputViewModel.ViewState.Loaded loaded, ChatInputViewModel.AttachmentContext attachmentContext, Function0 function0, boolean z2) { super(2); this.this$0 = chatInputViewModel; this.$context = context; this.$loadedViewState = loaded; - this.$attachments = arrayList; - this.$hasImage = z2; - this.$hasVideo = z3; - this.$hasGif = z4; + this.$attachmentsContext = attachmentContext; this.$messageResendCompressedHandler = function0; - this.$isThreadDraft = z5; + this.$isThreadDraft = z2; } /* Return type fixed from 'java.lang.Object' to match base method */ diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1$synchronousValidationSucceeded$2.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1$synchronousValidationSucceeded$2.java index bc9903fc1d..b4b49f5dd5 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1$synchronousValidationSucceeded$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1$synchronousValidationSucceeded$2.java @@ -25,7 +25,6 @@ public final class ChatInputViewModel$sendMessage$sendMessage$1$synchronousValid public final void invoke(int i, boolean z2) { PublishSubject access$getEventSubject$p = ChatInputViewModel.access$getEventSubject$p(this.this$0.this$0); - ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = this.this$0; - access$getEventSubject$p.j.onNext(new ChatInputViewModel.Event.FilesTooLarge(i, chatInputViewModel$sendMessage$sendMessage$1.$currentFileSizeMB, chatInputViewModel$sendMessage$sendMessage$1.$maxAttachmentSizeMB, z2, chatInputViewModel$sendMessage$sendMessage$1.$attachments, chatInputViewModel$sendMessage$sendMessage$1.$hasImage, chatInputViewModel$sendMessage$sendMessage$1.$hasVideo, chatInputViewModel$sendMessage$sendMessage$1.$hasGif, chatInputViewModel$sendMessage$sendMessage$1.$messageResendCompressedHandler)); + access$getEventSubject$p.j.onNext(new ChatInputViewModel.Event.FilesTooLarge(i, this.this$0.$attachmentsContext.getCurrentFileSizeMB(), this.this$0.$attachmentsContext.getMaxAttachmentSizeMB(), z2, this.this$0.$attachmentsContext.getAttachments(), this.this$0.$attachmentsContext.getHasImage(), this.this$0.$attachmentsContext.getHasVideo(), this.this$0.$attachmentsContext.getHasGif(), this.this$0.$messageResendCompressedHandler)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1.java index abf05c9280..156fc90b0c 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1.java @@ -4,20 +4,14 @@ import com.discord.widgets.chat.MessageContent; import com.discord.widgets.chat.MessageManager; import com.discord.widgets.chat.input.ChatInputViewModel; import d0.z.d.o; -import java.util.ArrayList; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function2; /* compiled from: ChatInputViewModel.kt */ public final class ChatInputViewModel$sendMessage$sendMessage$1 extends o implements Function1 { - public final /* synthetic */ ArrayList $attachments; - public final /* synthetic */ float $currentFileSizeMB; - public final /* synthetic */ boolean $hasGif; - public final /* synthetic */ boolean $hasImage; - public final /* synthetic */ boolean $hasVideo; + public final /* synthetic */ ChatInputViewModel.AttachmentContext $attachmentsContext; public final /* synthetic */ ChatInputViewModel.ViewState.Loaded $loadedViewState; - public final /* synthetic */ float $maxAttachmentSizeMB; public final /* synthetic */ MessageContent $messageContent; public final /* synthetic */ MessageManager $messageManager; public final /* synthetic */ Function0 $messageResendCompressedHandler; @@ -27,20 +21,15 @@ public final class ChatInputViewModel$sendMessage$sendMessage$1 extends o implem public final /* synthetic */ ChatInputViewModel this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public ChatInputViewModel$sendMessage$sendMessage$1(ChatInputViewModel chatInputViewModel, MessageManager messageManager, MessageContent messageContent, float f, ChatInputViewModel.ViewState.Loaded loaded, ArrayList arrayList, Function2 function2, Function2 function22, float f2, boolean z2, boolean z3, boolean z4, Function0 function0, Function1 function1) { + public ChatInputViewModel$sendMessage$sendMessage$1(ChatInputViewModel chatInputViewModel, MessageManager messageManager, MessageContent messageContent, ChatInputViewModel.AttachmentContext attachmentContext, ChatInputViewModel.ViewState.Loaded loaded, Function2 function2, Function2 function22, Function0 function0, Function1 function1) { super(1); this.this$0 = chatInputViewModel; this.$messageManager = messageManager; this.$messageContent = messageContent; - this.$currentFileSizeMB = f; + this.$attachmentsContext = attachmentContext; this.$loadedViewState = loaded; - this.$attachments = arrayList; this.$messageSendResultHandler = function2; this.$onMessageTooLong = function22; - this.$maxAttachmentSizeMB = f2; - this.$hasImage = z2; - this.$hasVideo = z3; - this.$hasGif = z4; this.$messageResendCompressedHandler = function0; this.$onValidationResult = function1; } @@ -54,6 +43,6 @@ public final class ChatInputViewModel$sendMessage$sendMessage$1 extends o implem } public final void invoke(long j) { - this.$onValidationResult.invoke(Boolean.valueOf(MessageManager.sendMessage$default(this.$messageManager, this.$messageContent.getTextContent(), this.$messageContent.getMentionedUsers(), new MessageManager.AttachmentsRequest(this.$currentFileSizeMB, this.$loadedViewState.getMaxFileSizeMB(), this.$attachments), Long.valueOf(j), null, false, this.$onMessageTooLong, new ChatInputViewModel$sendMessage$sendMessage$1$synchronousValidationSucceeded$2(this), new ChatInputViewModel$sendMessage$sendMessage$1$synchronousValidationSucceeded$1(this), 48, null))); + this.$onValidationResult.invoke(Boolean.valueOf(MessageManager.sendMessage$default(this.$messageManager, this.$messageContent.getTextContent(), this.$messageContent.getMentionedUsers(), new MessageManager.AttachmentsRequest(this.$attachmentsContext.getCurrentFileSizeMB(), this.$loadedViewState.getMaxFileSizeMB(), this.$attachmentsContext.getAttachments()), Long.valueOf(j), null, false, this.$onMessageTooLong, new ChatInputViewModel$sendMessage$sendMessage$1$synchronousValidationSucceeded$2(this), new ChatInputViewModel$sendMessage$sendMessage$1$synchronousValidationSucceeded$1(this), 48, null))); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java index f2dbc3fec2..8e9772be05 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java @@ -65,6 +65,7 @@ import com.discord.widgets.user.account.WidgetUserAccountVerifyBase; import com.discord.widgets.user.email.WidgetUserEmailVerify; import com.discord.widgets.user.phone.WidgetUserPhoneManage; import com.lytefast.flexinput.model.Attachment; +import d0.t.n; import d0.t.o; import d0.t.u; import d0.z.d.k; @@ -139,6 +140,181 @@ public final class ChatInputViewModel extends AppViewModel { } } + /* compiled from: ChatInputViewModel.kt */ + public static final class AttachmentContext { + private final List attachmentSizes; + private final ArrayList> attachments; + private final float currentFileSizeMB; + private final boolean hasGif; + private final boolean hasImage; + private final boolean hasVideo; + private final float maxAttachmentSizeMB; + + public AttachmentContext(ArrayList> arrayList, boolean z2, boolean z3, boolean z4, List list, float f, float f2) { + m.checkNotNullParameter(arrayList, "attachments"); + m.checkNotNullParameter(list, "attachmentSizes"); + this.attachments = arrayList; + this.hasImage = z2; + this.hasVideo = z3; + this.hasGif = z4; + this.attachmentSizes = list; + this.currentFileSizeMB = f; + this.maxAttachmentSizeMB = f2; + } + + /* JADX DEBUG: Multi-variable search result rejected for r5v0, resolved type: com.discord.widgets.chat.input.ChatInputViewModel$AttachmentContext */ + /* JADX WARN: Multi-variable type inference failed */ + public static /* synthetic */ AttachmentContext copy$default(AttachmentContext attachmentContext, ArrayList arrayList, boolean z2, boolean z3, boolean z4, List list, float f, float f2, int i, Object obj) { + if ((i & 1) != 0) { + arrayList = attachmentContext.attachments; + } + if ((i & 2) != 0) { + z2 = attachmentContext.hasImage; + } + if ((i & 4) != 0) { + z3 = attachmentContext.hasVideo; + } + if ((i & 8) != 0) { + z4 = attachmentContext.hasGif; + } + if ((i & 16) != 0) { + list = attachmentContext.attachmentSizes; + } + if ((i & 32) != 0) { + f = attachmentContext.currentFileSizeMB; + } + if ((i & 64) != 0) { + f2 = attachmentContext.maxAttachmentSizeMB; + } + return attachmentContext.copy(arrayList, z2, z3, z4, list, f, f2); + } + + public final ArrayList> component1() { + return this.attachments; + } + + public final boolean component2() { + return this.hasImage; + } + + public final boolean component3() { + return this.hasVideo; + } + + public final boolean component4() { + return this.hasGif; + } + + public final List component5() { + return this.attachmentSizes; + } + + public final float component6() { + return this.currentFileSizeMB; + } + + public final float component7() { + return this.maxAttachmentSizeMB; + } + + public final AttachmentContext copy(ArrayList> arrayList, boolean z2, boolean z3, boolean z4, List list, float f, float f2) { + m.checkNotNullParameter(arrayList, "attachments"); + m.checkNotNullParameter(list, "attachmentSizes"); + return new AttachmentContext(arrayList, z2, z3, z4, list, f, f2); + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof AttachmentContext)) { + return false; + } + AttachmentContext attachmentContext = (AttachmentContext) obj; + return m.areEqual(this.attachments, attachmentContext.attachments) && this.hasImage == attachmentContext.hasImage && this.hasVideo == attachmentContext.hasVideo && this.hasGif == attachmentContext.hasGif && m.areEqual(this.attachmentSizes, attachmentContext.attachmentSizes) && Float.compare(this.currentFileSizeMB, attachmentContext.currentFileSizeMB) == 0 && Float.compare(this.maxAttachmentSizeMB, attachmentContext.maxAttachmentSizeMB) == 0; + } + + public final List getAttachmentSizes() { + return this.attachmentSizes; + } + + public final ArrayList> getAttachments() { + return this.attachments; + } + + public final float getCurrentFileSizeMB() { + return this.currentFileSizeMB; + } + + public final boolean getHasGif() { + return this.hasGif; + } + + public final boolean getHasImage() { + return this.hasImage; + } + + public final boolean getHasVideo() { + return this.hasVideo; + } + + public final float getMaxAttachmentSizeMB() { + return this.maxAttachmentSizeMB; + } + + public int hashCode() { + ArrayList> arrayList = this.attachments; + int i = 0; + int hashCode = (arrayList != null ? arrayList.hashCode() : 0) * 31; + boolean z2 = this.hasImage; + int i2 = 1; + if (z2) { + z2 = true; + } + int i3 = z2 ? 1 : 0; + int i4 = z2 ? 1 : 0; + int i5 = z2 ? 1 : 0; + int i6 = (hashCode + i3) * 31; + boolean z3 = this.hasVideo; + if (z3) { + z3 = true; + } + int i7 = z3 ? 1 : 0; + int i8 = z3 ? 1 : 0; + int i9 = z3 ? 1 : 0; + int i10 = (i6 + i7) * 31; + boolean z4 = this.hasGif; + if (!z4) { + i2 = z4 ? 1 : 0; + } + int i11 = (i10 + i2) * 31; + List list = this.attachmentSizes; + if (list != null) { + i = list.hashCode(); + } + return Float.floatToIntBits(this.maxAttachmentSizeMB) + ((Float.floatToIntBits(this.currentFileSizeMB) + ((i11 + i) * 31)) * 31); + } + + public String toString() { + StringBuilder R = a.R("AttachmentContext(attachments="); + R.append(this.attachments); + R.append(", hasImage="); + R.append(this.hasImage); + R.append(", hasVideo="); + R.append(this.hasVideo); + R.append(", hasGif="); + R.append(this.hasGif); + R.append(", attachmentSizes="); + R.append(this.attachmentSizes); + R.append(", currentFileSizeMB="); + R.append(this.currentFileSizeMB); + R.append(", maxAttachmentSizeMB="); + R.append(this.maxAttachmentSizeMB); + R.append(")"); + return R.toString(); + } + } + /* compiled from: ChatInputViewModel.kt */ public static final class Companion { private Companion() { @@ -1802,6 +1978,15 @@ public final class ChatInputViewModel extends AppViewModel { chatInputViewModel.handleStoreState(storeState); } + /* JADX DEBUG: Multi-variable search result rejected for r6v0, resolved type: com.discord.widgets.chat.input.ChatInputViewModel */ + /* JADX WARN: Multi-variable type inference failed */ + public static /* synthetic */ void createAndGotoThread$default(ChatInputViewModel chatInputViewModel, Context context, Long l, String str, ViewState.Loaded loaded, Function1 function1, int i, Object obj) { + if ((i & 16) != 0) { + function1 = null; + } + chatInputViewModel.createAndGotoThread(context, l, str, loaded, function1); + } + private final void handleStoreChatEvent(StoreChat.Event event) { if (event instanceof StoreChat.Event.AppendChatText) { PublishSubject publishSubject = this.eventSubject; @@ -1875,17 +2060,33 @@ public final class ChatInputViewModel extends AppViewModel { } } - public static /* synthetic */ boolean sendCommand$default(ChatInputViewModel chatInputViewModel, ApplicationCommandData applicationCommandData, boolean z2, int i, Object obj) { - if ((i & 2) != 0) { - z2 = false; - } - return chatInputViewModel.sendCommand(applicationCommandData, z2); + public static /* synthetic */ void sendCommand$default(ChatInputViewModel chatInputViewModel, Context context, MessageManager messageManager, ApplicationCommandData applicationCommandData, List list, boolean z2, boolean z3, Function1 function1, int i, Object obj) { + chatInputViewModel.sendCommand(context, messageManager, applicationCommandData, list, (i & 16) != 0 ? false : z2, (i & 32) != 0 ? false : z3, (i & 64) != 0 ? ChatInputViewModel$sendCommand$1.INSTANCE : function1); } public static /* synthetic */ void sendMessage$default(ChatInputViewModel chatInputViewModel, Context context, MessageManager messageManager, MessageContent messageContent, List list, boolean z2, Function1 function1, int i, Object obj) { chatInputViewModel.sendMessage(context, messageManager, messageContent, list, (i & 16) != 0 ? false : z2, function1); } + public final void createAndGotoThread(Context context, Long l, String str, ViewState.Loaded loaded, Function1 function1) { + m.checkNotNullParameter(context, "context"); + m.checkNotNullParameter(loaded, "loadedViewState"); + ThreadUtils threadUtils = ThreadUtils.INSTANCE; + long channelId = loaded.getChannelId(); + int i = ChannelUtils.i(loaded.getChannel()) ? 10 : loaded.getThreadDraftState().isPrivate() ? 12 : 11; + String threadName = loaded.getThreadDraftState().getThreadName(); + if (threadName == null) { + threadName = ""; + } + Integer autoArchiveDuration = loaded.getThreadDraftState().getAutoArchiveDuration(); + if (autoArchiveDuration == null) { + autoArchiveDuration = loaded.getChannel().d(); + } + Observable z2 = ObservableExtensionsKt.restSubscribeOn$default(threadUtils.createThread(channelId, l, i, threadName, Integer.valueOf(autoArchiveDuration != null ? autoArchiveDuration.intValue() : 1440), str), false, 1, null).z(new ChatInputViewModel$createAndGotoThread$1(this)); + m.checkNotNullExpressionValue(z2, "ThreadUtils.createThread…utationLatest()\n }"); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(z2, this, null, 2, null), ChatInputViewModel.class, (Context) null, (Function1) null, new ChatInputViewModel$createAndGotoThread$3(loaded, context), (Function0) null, (Function0) null, new ChatInputViewModel$createAndGotoThread$2(loaded, function1), 54, (Object) null); + } + public final void deleteEditingMessage() { this.storeChat.setEditingMessage(null); } @@ -1964,237 +2165,89 @@ public final class ChatInputViewModel extends AppViewModel { } } - public final boolean sendCommand(ApplicationCommandData applicationCommandData, boolean z2) { + public final void sendCommand(Context context, MessageManager messageManager, ApplicationCommandData applicationCommandData, List> list, boolean z2, boolean z3, Function1 function1) { + m.checkNotNullParameter(context, "context"); + m.checkNotNullParameter(messageManager, "messageManager"); m.checkNotNullParameter(applicationCommandData, "applicationCommandData"); + m.checkNotNullParameter(list, "attachmentsRaw"); + m.checkNotNullParameter(function1, "onValidationResult"); ViewState viewState = getViewState(); - Long l = null; if (!(viewState instanceof ViewState.Loaded)) { viewState = null; } ViewState.Loaded loaded = (ViewState.Loaded) viewState; - if (loaded == null) { - return false; - } - if (applicationCommandData.getValidInputs() || z2) { - if (loaded.getChannel().f() != 0) { - l = Long.valueOf(loaded.getChannel().f()); + if (loaded != null) { + AttachmentContext attachmentContext = toAttachmentContext(n.emptyList(), context); + ChatInputViewModel$sendCommand$commandResendCompressedHandler$1 chatInputViewModel$sendCommand$commandResendCompressedHandler$1 = (z3 || !attachmentContext.getHasImage()) ? null : new ChatInputViewModel$sendCommand$commandResendCompressedHandler$1(this, context, attachmentContext, messageManager, applicationCommandData, z2); + if (applicationCommandData.getValidInputs() || z2) { + Long valueOf = loaded.getChannel().f() != 0 ? Long.valueOf(loaded.getChannel().f()) : null; + if (z2) { + this.storeApplicationCommands.requestApplicationCommandAutocompleteData(valueOf, loaded.getChannelId(), applicationCommandData); + function1.invoke(Boolean.TRUE); + } else if (chatInputViewModel$sendCommand$commandResendCompressedHandler$1 == null || !this.storeUserSettings.getIsAutoImageCompressionEnabled()) { + onCommandUsed(applicationCommandData); + function1.invoke(Boolean.valueOf(messageManager.sendCommand(loaded.getChannelId(), valueOf, applicationCommandData.getApplicationCommand().getVersion(), applicationCommandData, new MessageManager.AttachmentsRequest(attachmentContext.getCurrentFileSizeMB(), loaded.getMaxFileSizeMB(), attachmentContext.getAttachments()), ChatInputViewModel$sendCommand$validated$1.INSTANCE, ChatInputViewModel$sendCommand$validated$2.INSTANCE, new ChatInputViewModel$sendCommand$validated$3(this, attachmentContext, chatInputViewModel$sendCommand$commandResendCompressedHandler$1)))); + } else { + chatInputViewModel$sendCommand$commandResendCompressedHandler$1.mo1invoke(); + } + } else { + onCommandInputsInvalid(); + function1.invoke(Boolean.FALSE); } - if (z2) { - this.storeApplicationCommands.requestApplicationCommandAutocompleteData(l, loaded.getChannelId(), applicationCommandData); - return true; - } - onCommandUsed(applicationCommandData); - this.storeApplicationInteractions.sendApplicationCommand(loaded.getChannelId(), l, applicationCommandData.getApplicationCommand().getVersion(), applicationCommandData, ChatInputViewModel$sendCommand$1.INSTANCE, ChatInputViewModel$sendCommand$2.INSTANCE); - return true; + } else { + function1.invoke(Boolean.FALSE); } - onCommandInputsInvalid(); - return false; } - /* JADX WARNING: Removed duplicated region for block: B:17:0x0072 */ - /* JADX WARNING: Removed duplicated region for block: B:26:0x009a */ - /* JADX WARNING: Removed duplicated region for block: B:35:0x00ce A[LOOP:3: B:33:0x00c8->B:35:0x00ce, LOOP_END] */ - /* JADX WARNING: Removed duplicated region for block: B:38:0x00f7 */ - /* JADX WARNING: Removed duplicated region for block: B:39:0x00fe */ - /* JADX WARNING: Removed duplicated region for block: B:42:0x0107 */ - /* JADX WARNING: Removed duplicated region for block: B:43:0x010a */ - /* JADX WARNING: Removed duplicated region for block: B:46:0x0113 A[ADDED_TO_REGION] */ - /* JADX WARNING: Removed duplicated region for block: B:51:0x014b */ - /* JADX WARNING: Removed duplicated region for block: B:57:0x0185 */ - /* JADX WARNING: Removed duplicated region for block: B:64:0x01bf */ - /* JADX WARNING: Removed duplicated region for block: B:80:0x0214 */ public final void sendMessage(Context context, MessageManager messageManager, MessageContent messageContent, List> list, boolean z2, Function1 function1) { - boolean z3; - boolean z4; - boolean z5; - float floatValue; - boolean z6; - ChatInputViewModel$sendMessage$messageResendCompressedHandler$1 chatInputViewModel$sendMessage$messageResendCompressedHandler$1; - ChatInputViewModel$sendMessage$onMessageTooLong$1 chatInputViewModel$sendMessage$onMessageTooLong$1; m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(messageManager, "messageManager"); m.checkNotNullParameter(messageContent, "messageContent"); m.checkNotNullParameter(list, "attachmentsRaw"); m.checkNotNullParameter(function1, "onValidationResult"); ViewState viewState = getViewState(); - String str = null; if (!(viewState instanceof ViewState.Loaded)) { viewState = null; } ViewState.Loaded loaded = (ViewState.Loaded) viewState; if (loaded != null) { - ArrayList arrayList = new ArrayList(list); - boolean z7 = true; + AttachmentContext attachmentContext = toAttachmentContext(list, context); + boolean z3 = true; int i = 0; - if (!arrayList.isEmpty()) { - Iterator it = arrayList.iterator(); - while (true) { - if (!it.hasNext()) { - break; + boolean z4 = loaded.getSelectedThreadDraft() != null; + ChatInputViewModel$sendMessage$messageResendCompressedHandler$1 chatInputViewModel$sendMessage$messageResendCompressedHandler$1 = (z2 || !attachmentContext.getHasImage()) ? null : new ChatInputViewModel$sendMessage$messageResendCompressedHandler$1(this, context, attachmentContext, messageManager, messageContent, function1); + ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, attachmentContext, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z4); + ChatInputViewModel$sendMessage$onMessageTooLong$1 chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this); + if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 == null || !this.storeUserSettings.getIsAutoImageCompressionEnabled()) { + ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, attachmentContext, loaded, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1); + if (loaded.isEditing() && loaded.getEditingMessage() != null) { + Message message = loaded.getEditingMessage().getMessage(); + long id2 = message.getId(); + long channelId = message.getChannelId(); + String textContent = messageContent.getTextContent(); + String content = message.getContent(); + if (content != null) { + i = content.length(); } - Attachment attachment = (Attachment) it.next(); - m.checkNotNullExpressionValue(attachment, "attachment"); - if (AttachmentUtilsKt.isImage(attachment, context.getContentResolver())) { - z3 = true; - break; + function1.invoke(Boolean.valueOf(messageManager.editMessage(id2, channelId, textContent, chatInputViewModel$sendMessage$onMessageTooLong$1, Integer.valueOf(i)))); + } else if (z4) { + String threadName = loaded.getThreadDraftState().getThreadName(); + if (!(threadName == null || threadName.length() == 0)) { + z3 = false; } + if (z3) { + StoreStream.Companion.getThreadDraft().setDraftState(StoreThreadDraft.ThreadDraftState.copy$default(loaded.getThreadDraftState(), false, null, null, false, true, 15, null)); + return; + } + StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft(); + Long starterMessageId = selectedThreadDraft != null ? selectedThreadDraft.getStarterMessageId() : null; + StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft2 = loaded.getSelectedThreadDraft(); + createAndGotoThread(context, starterMessageId, selectedThreadDraft2 != null ? selectedThreadDraft2.getThreadStartLocation() : null, loaded, new ChatInputViewModel$sendMessage$1(chatInputViewModel$sendMessage$sendMessage$1)); + } else { + chatInputViewModel$sendMessage$sendMessage$1.invoke((ChatInputViewModel$sendMessage$sendMessage$1) Long.valueOf(loaded.getChannelId())); } - if (!arrayList.isEmpty()) { - Iterator it2 = arrayList.iterator(); - while (true) { - if (!it2.hasNext()) { - break; - } - Attachment attachment2 = (Attachment) it2.next(); - m.checkNotNullExpressionValue(attachment2, "attachment"); - if (AttachmentUtilsKt.isVideo(attachment2, context.getContentResolver())) { - z4 = true; - break; - } - } - if (!arrayList.isEmpty()) { - Iterator it3 = arrayList.iterator(); - while (true) { - if (!it3.hasNext()) { - break; - } - Attachment attachment3 = (Attachment) it3.next(); - m.checkNotNullExpressionValue(attachment3, "attachment"); - if (AttachmentUtilsKt.isGif(attachment3, context.getContentResolver())) { - z5 = true; - break; - } - } - ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10)); - for (Attachment attachment4 : arrayList) { - Uri uri = attachment4.getUri(); - ContentResolver contentResolver = context.getContentResolver(); - m.checkNotNullExpressionValue(contentResolver, "context.contentResolver"); - arrayList2.add(Float.valueOf(SendUtilsKt.computeFileSizeMegabytes(uri, contentResolver))); - } - float sumOfFloat = u.sumOfFloat(arrayList2); - Float maxOrNull = u.m86maxOrNull((Iterable) arrayList2); - floatValue = maxOrNull == null ? maxOrNull.floatValue() : 0.0f; - z6 = loaded.getSelectedThreadDraft() == null; - ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, context); - chatInputViewModel$sendMessage$messageResendCompressedHandler$1 = (!z2 || !z3) ? null : new ChatInputViewModel$sendMessage$messageResendCompressedHandler$1(this, context, arrayList, messageManager, messageContent, function1); - ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6); - chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this); - if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null || !this.storeUserSettings.getIsAutoImageCompressionEnabled()) { - ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1); - if (!loaded.isEditing() && loaded.getEditingMessage() != null) { - Message message = loaded.getEditingMessage().getMessage(); - long id2 = message.getId(); - long channelId = message.getChannelId(); - String textContent = messageContent.getTextContent(); - String content = message.getContent(); - if (content != null) { - i = content.length(); - } - function1.invoke(Boolean.valueOf(messageManager.editMessage(id2, channelId, textContent, chatInputViewModel$sendMessage$onMessageTooLong$1, Integer.valueOf(i)))); - return; - } else if (!z6) { - String threadName = loaded.getThreadDraftState().getThreadName(); - if (!(threadName == null || threadName.length() == 0)) { - z7 = false; - } - if (z7) { - StoreStream.Companion.getThreadDraft().setDraftState(StoreThreadDraft.ThreadDraftState.copy$default(loaded.getThreadDraftState(), false, null, null, false, true, 15, null)); - return; - } - StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft(); - Long starterMessageId = selectedThreadDraft != null ? selectedThreadDraft.getStarterMessageId() : null; - StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft2 = loaded.getSelectedThreadDraft(); - if (selectedThreadDraft2 != null) { - str = selectedThreadDraft2.getThreadStartLocation(); - } - chatInputViewModel$sendMessage$1.invoke(starterMessageId, str, (Function1) new ChatInputViewModel$sendMessage$2(chatInputViewModel$sendMessage$sendMessage$1)); - return; - } else { - chatInputViewModel$sendMessage$sendMessage$1.invoke((ChatInputViewModel$sendMessage$sendMessage$1) Long.valueOf(loaded.getChannelId())); - return; - } - } else { - chatInputViewModel$sendMessage$messageResendCompressedHandler$1.mo1invoke(); - return; - } - } - z5 = false; - ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10)); - while (r1.hasNext()) { - } - float sumOfFloat = u.sumOfFloat(arrayList2); - Float maxOrNull = u.m86maxOrNull((Iterable) arrayList2); - if (maxOrNull == null) { - } - if (loaded.getSelectedThreadDraft() == null) { - } - ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, context); - if (!z2) { - } - ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6); - chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this); - if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null) { - } - ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1); - if (!loaded.isEditing()) { - } - if (!z6) { - } - } - z4 = false; - if (!arrayList.isEmpty()) { - } - z5 = false; - ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10)); - while (r1.hasNext()) { - } - float sumOfFloat = u.sumOfFloat(arrayList2); - Float maxOrNull = u.m86maxOrNull((Iterable) arrayList2); - if (maxOrNull == null) { - } - if (loaded.getSelectedThreadDraft() == null) { - } - ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, context); - if (!z2) { - } - ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6); - chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this); - if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null) { - } - ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1); - if (!loaded.isEditing()) { - } - if (!z6) { - } - } - z3 = false; - if (!arrayList.isEmpty()) { - } - z4 = false; - if (!arrayList.isEmpty()) { - } - z5 = false; - ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10)); - while (r1.hasNext()) { - } - float sumOfFloat = u.sumOfFloat(arrayList2); - Float maxOrNull = u.m86maxOrNull((Iterable) arrayList2); - if (maxOrNull == null) { - } - if (loaded.getSelectedThreadDraft() == null) { - } - ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, context); - if (!z2) { - } - ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6); - chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this); - if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null) { - } - ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1); - if (!loaded.isEditing()) { - } - if (!z6) { + } else { + chatInputViewModel$sendMessage$messageResendCompressedHandler$1.mo1invoke(); } } else { function1.invoke(Boolean.FALSE); @@ -2215,6 +2268,96 @@ public final class ChatInputViewModel extends AppViewModel { } } + /* JADX WARNING: Removed duplicated region for block: B:12:0x0041 */ + /* JADX WARNING: Removed duplicated region for block: B:21:0x0067 */ + /* JADX WARNING: Removed duplicated region for block: B:30:0x009a A[LOOP:3: B:28:0x0094->B:30:0x009a, LOOP_END] */ + /* JADX WARNING: Removed duplicated region for block: B:33:0x00c3 */ + /* JADX WARNING: Removed duplicated region for block: B:34:0x00c9 */ + public final AttachmentContext toAttachmentContext(List> list, Context context) { + boolean z2; + boolean z3; + boolean z4; + m.checkNotNullParameter(list, "$this$toAttachmentContext"); + m.checkNotNullParameter(context, "context"); + ArrayList arrayList = new ArrayList(list); + if (!arrayList.isEmpty()) { + Iterator it = arrayList.iterator(); + while (true) { + if (!it.hasNext()) { + break; + } + Attachment attachment = (Attachment) it.next(); + m.checkNotNullExpressionValue(attachment, "attachment"); + if (AttachmentUtilsKt.isImage(attachment, context.getContentResolver())) { + z2 = true; + break; + } + } + if (!arrayList.isEmpty()) { + Iterator it2 = arrayList.iterator(); + while (true) { + if (!it2.hasNext()) { + break; + } + Attachment attachment2 = (Attachment) it2.next(); + m.checkNotNullExpressionValue(attachment2, "attachment"); + if (AttachmentUtilsKt.isVideo(attachment2, context.getContentResolver())) { + z3 = true; + break; + } + } + if (!arrayList.isEmpty()) { + Iterator it3 = arrayList.iterator(); + while (true) { + if (!it3.hasNext()) { + break; + } + Attachment attachment3 = (Attachment) it3.next(); + m.checkNotNullExpressionValue(attachment3, "attachment"); + if (AttachmentUtilsKt.isGif(attachment3, context.getContentResolver())) { + z4 = true; + break; + } + } + } + z4 = false; + ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10)); + for (Attachment attachment4 : arrayList) { + Uri uri = attachment4.getUri(); + ContentResolver contentResolver = context.getContentResolver(); + m.checkNotNullExpressionValue(contentResolver, "context.contentResolver"); + arrayList2.add(Float.valueOf(SendUtilsKt.computeFileSizeMegabytes(uri, contentResolver))); + } + float sumOfFloat = u.sumOfFloat(arrayList2); + Float maxOrNull = u.m86maxOrNull((Iterable) arrayList2); + return new AttachmentContext(arrayList, z2, z3, z4, arrayList2, sumOfFloat, maxOrNull != null ? maxOrNull.floatValue() : 0.0f); + } + z3 = false; + if (!arrayList.isEmpty()) { + } + z4 = false; + ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10)); + while (r0.hasNext()) { + } + float sumOfFloat = u.sumOfFloat(arrayList2); + Float maxOrNull = u.m86maxOrNull((Iterable) arrayList2); + return new AttachmentContext(arrayList, z2, z3, z4, arrayList2, sumOfFloat, maxOrNull != null ? maxOrNull.floatValue() : 0.0f); + } + z2 = false; + if (!arrayList.isEmpty()) { + } + z3 = false; + if (!arrayList.isEmpty()) { + } + z4 = false; + ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10)); + while (r0.hasNext()) { + } + float sumOfFloat = u.sumOfFloat(arrayList2); + Float maxOrNull = u.m86maxOrNull((Iterable) arrayList2); + return new AttachmentContext(arrayList, z2, z3, z4, arrayList2, sumOfFloat, maxOrNull != null ? maxOrNull.floatValue() : 0.0f); + } + public final void togglePendingReplyShouldMention() { ViewState viewState = getViewState(); ViewState.Loaded.PendingReplyState.Replying replying = null; diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$1.java index aa27cbe39d..7f9dfac550 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$1.java @@ -1,13 +1,19 @@ package com.discord.widgets.chat.input; +import android.content.Context; +import com.discord.widgets.chat.MessageManager; import com.discord.widgets.chat.input.models.ApplicationCommandData; +import com.lytefast.flexinput.model.Attachment; import d0.z.d.m; import d0.z.d.o; +import java.util.List; import kotlin.Unit; import kotlin.jvm.functions.Function1; -import kotlin.jvm.functions.Function3; +import kotlin.jvm.functions.Function4; /* compiled from: WidgetChatInput.kt */ -public final class WidgetChatInput$configureSendListeners$1 extends o implements Function3, Unit> { +public final class WidgetChatInput$configureSendListeners$1 extends o implements Function4>, Boolean, Function1, Unit> { + public final /* synthetic */ Context $context; + public final /* synthetic */ MessageManager $messageManager; public final /* synthetic */ WidgetChatInput this$0; /* compiled from: WidgetChatInput.kt */ @@ -32,34 +38,37 @@ public final class WidgetChatInput$configureSendListeners$1 extends o implements } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatInput$configureSendListeners$1(WidgetChatInput widgetChatInput) { - super(3); + public WidgetChatInput$configureSendListeners$1(WidgetChatInput widgetChatInput, Context context, MessageManager messageManager) { + super(4); this.this$0 = widgetChatInput; + this.$context = context; + this.$messageManager = messageManager; } /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.WidgetChatInput$configureSendListeners$1 */ /* JADX WARN: Multi-variable type inference failed */ - public static /* synthetic */ void invoke$default(WidgetChatInput$configureSendListeners$1 widgetChatInput$configureSendListeners$1, ApplicationCommandData applicationCommandData, boolean z2, Function1 function1, int i, Object obj) { - if ((i & 2) != 0) { + public static /* synthetic */ void invoke$default(WidgetChatInput$configureSendListeners$1 widgetChatInput$configureSendListeners$1, ApplicationCommandData applicationCommandData, List list, boolean z2, Function1 function1, int i, Object obj) { + if ((i & 4) != 0) { z2 = false; } - if ((i & 4) != 0) { + if ((i & 8) != 0) { function1 = AnonymousClass1.INSTANCE; } - widgetChatInput$configureSendListeners$1.invoke(applicationCommandData, z2, function1); + widgetChatInput$configureSendListeners$1.invoke(applicationCommandData, list, z2, function1); } /* 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] */ - @Override // kotlin.jvm.functions.Function3 - public /* bridge */ /* synthetic */ Unit invoke(ApplicationCommandData applicationCommandData, Boolean bool, Function1 function1) { - invoke(applicationCommandData, bool.booleanValue(), (Function1) function1); + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function4 + public /* bridge */ /* synthetic */ Unit invoke(ApplicationCommandData applicationCommandData, List> list, Boolean bool, Function1 function1) { + invoke(applicationCommandData, list, bool.booleanValue(), (Function1) function1); return Unit.a; } - public final void invoke(ApplicationCommandData applicationCommandData, boolean z2, Function1 function1) { + public final void invoke(ApplicationCommandData applicationCommandData, List> list, boolean z2, Function1 function1) { m.checkNotNullParameter(applicationCommandData, "applicationCommandData"); + m.checkNotNullParameter(list, "attachmentsRaw"); m.checkNotNullParameter(function1, "onValidationResult"); - function1.invoke(Boolean.valueOf(WidgetChatInput.access$getViewModel$p(this.this$0).sendCommand(applicationCommandData, z2))); + WidgetChatInput.access$getViewModel$p(this.this$0).sendCommand(this.$context, this.$messageManager, applicationCommandData, list, z2, false, function1); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$3.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$3.java index 2fc7f30c23..86d9df7fff 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$3.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$3.java @@ -44,7 +44,7 @@ public final class WidgetChatInput$configureSendListeners$3 extends o implements } else if (applicationCommandData == null || applicationCommandData.getApplicationCommand().getBuiltIn()) { this.$sendMessage$2.invoke(list, applicationCommandData, function1); } else { - this.$sendCommand$1.invoke(applicationCommandData, false, function1); + this.$sendCommand$1.invoke(applicationCommandData, list, false, function1); } } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$5.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$5.java index 03fe9ba0ab..c8a3d5205a 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$5.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$5.java @@ -3,6 +3,7 @@ package com.discord.widgets.chat.input; import com.discord.models.commands.ApplicationCommandOption; import com.discord.widgets.chat.input.autocomplete.InputAutocomplete; import com.discord.widgets.chat.input.models.ApplicationCommandData; +import d0.t.n; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; @@ -32,7 +33,7 @@ public final class WidgetChatInput$configureSendListeners$5 extends o implements InputAutocomplete access$getAutocomplete$p = WidgetChatInput.access$getAutocomplete$p(this.this$0); ApplicationCommandData applicationCommandData = access$getAutocomplete$p != null ? access$getAutocomplete$p.getApplicationCommandData(applicationCommandOption) : null; if (applicationCommandData != null) { - WidgetChatInput$configureSendListeners$1.invoke$default(this.$sendCommand$1, applicationCommandData, true, null, 4, null); + WidgetChatInput$configureSendListeners$1.invoke$default(this.$sendCommand$1, applicationCommandData, n.emptyList(), true, null, 8, null); } } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java index f0a6ec1206..d226a91df7 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java @@ -372,8 +372,8 @@ public final class WidgetChatInput extends AppFragment { WidgetChatInputEditText widgetChatInputEditText = this.chatInputEditTextHolder; if (widgetChatInputEditText != null) { Context requireContext = requireContext(); - MessageManager messageManager = new MessageManager(requireContext, null, null, null, null, null, null, null, 254, null); - WidgetChatInput$configureSendListeners$1 widgetChatInput$configureSendListeners$1 = new WidgetChatInput$configureSendListeners$1(this); + MessageManager messageManager = new MessageManager(requireContext, null, null, null, null, null, null, null, null, 510, null); + WidgetChatInput$configureSendListeners$1 widgetChatInput$configureSendListeners$1 = new WidgetChatInput$configureSendListeners$1(this, requireContext, messageManager); WidgetChatInput$configureSendListeners$3 widgetChatInput$configureSendListeners$3 = new WidgetChatInput$configureSendListeners$3(this, widgetChatInput$configureSendListeners$1, new WidgetChatInput$configureSendListeners$2(this, widgetChatInputEditText, requireContext, messageManager)); WidgetChatInput$configureSendListeners$4 widgetChatInput$configureSendListeners$4 = new WidgetChatInput$configureSendListeners$4(requireContext); boolean z2 = widgetChatInputEditText.getChannelId() != loaded.getChannelId(); diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteModelUtils.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteModelUtils.java index 5a3da4d2e3..f5626cca74 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteModelUtils.java +++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteModelUtils.java @@ -55,7 +55,7 @@ public final class AutocompleteModelUtils { static { ApplicationCommandType.values(); - int[] iArr = new int[11]; + int[] iArr = new int[12]; $EnumSwitchMapping$0 = iArr; iArr[ApplicationCommandType.CHANNEL.ordinal()] = 1; iArr[ApplicationCommandType.USER.ordinal()] = 2; diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteViewModel.java index 38360b8219..4a33f3c3a0 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteViewModel.java +++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteViewModel.java @@ -779,7 +779,7 @@ public final class AutocompleteViewModel extends AppViewModel { static { ApplicationCommandType.values(); - int[] iArr = new int[11]; + int[] iArr = new int[12]; $EnumSwitchMapping$0 = iArr; iArr[ApplicationCommandType.USER.ordinal()] = 1; iArr[ApplicationCommandType.CHANNEL.ordinal()] = 2; diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete.java index 106fed6f79..0f12c7f051 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete.java +++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete.java @@ -233,7 +233,7 @@ public final class InputAutocomplete { InputAutocomplete.access$getViewModel$p(this.this$0).selectStickerItem(sticker); Context context = InputAutocomplete.access$getEditText$p(this.this$0).getContext(); m.checkNotNullExpressionValue(context, "editText.context"); - MessageManager.sendMessage$default(new MessageManager(context, null, null, null, null, null, null, null, 254, null), null, null, null, null, d0.t.m.listOf(sticker), false, null, null, null, 495, null); + MessageManager.sendMessage$default(new MessageManager(context, null, null, null, null, null, null, null, null, 510, null), null, null, null, null, d0.t.m.listOf(sticker), false, null, null, null, 495, null); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java index 0ed1130af0..3c6349e71d 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java +++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java @@ -67,7 +67,7 @@ public final class AutocompleteCommandUtils { static { ApplicationCommandType.values(); - int[] iArr = new int[11]; + int[] iArr = new int[12]; $EnumSwitchMapping$0 = iArr; ApplicationCommandType applicationCommandType = ApplicationCommandType.USER; iArr[applicationCommandType.ordinal()] = 1; @@ -78,7 +78,7 @@ public final class AutocompleteCommandUtils { ApplicationCommandType applicationCommandType4 = ApplicationCommandType.MENTIONABLE; iArr[applicationCommandType4.ordinal()] = 4; ApplicationCommandType.values(); - int[] iArr2 = new int[11]; + int[] iArr2 = new int[12]; $EnumSwitchMapping$1 = iArr2; iArr2[ApplicationCommandType.SUBCOMMAND.ordinal()] = 1; iArr2[ApplicationCommandType.SUBCOMMAND_GROUP.ordinal()] = 2; @@ -95,8 +95,9 @@ public final class AutocompleteCommandUtils { iArr2[applicationCommandType3.ordinal()] = 9; iArr2[applicationCommandType4.ordinal()] = 10; iArr2[ApplicationCommandType.UNKNOWN.ordinal()] = 11; + iArr2[ApplicationCommandType.ATTACHMENT.ordinal()] = 12; ApplicationCommandType.values(); - int[] iArr3 = new int[11]; + int[] iArr3 = new int[12]; $EnumSwitchMapping$2 = iArr3; iArr3[applicationCommandType5.ordinal()] = 1; iArr3[applicationCommandType6.ordinal()] = 2; @@ -546,6 +547,7 @@ public final class AutocompleteCommandUtils { } break; case 10: + case 11: break; default: throw new NoWhenBranchMatchedException(); diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java index 560a4e8e13..962c5d938a 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java @@ -215,8 +215,8 @@ public final class GifCategoryViewModel extends AppViewModel { /* JADX WARNING: Illegal instructions before constructor call */ public /* synthetic */ GifCategoryViewModel(Context context, GifCategoryItem gifCategoryItem, MessageManager messageManager, StoreGifPicker storeGifPicker, StoreAnalytics storeAnalytics, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) { - this(context, gifCategoryItem, r15, r0, (i & 16) != 0 ? StoreStream.Companion.getAnalytics() : storeAnalytics, (i & 32) != 0 ? Companion.access$observeStoreState(Companion, gifCategoryItem, r0) : observable); - MessageManager messageManager2 = (i & 4) != 0 ? new MessageManager(context, null, null, null, null, null, null, null, 254, null) : messageManager; + this(context, gifCategoryItem, r16, r0, (i & 16) != 0 ? StoreStream.Companion.getAnalytics() : storeAnalytics, (i & 32) != 0 ? Companion.access$observeStoreState(Companion, gifCategoryItem, r0) : observable); + MessageManager messageManager2 = (i & 4) != 0 ? new MessageManager(context, null, null, null, null, null, null, null, null, 510, null) : messageManager; StoreGifPicker gifPicker = (i & 8) != 0 ? StoreStream.Companion.getGifPicker() : storeGifPicker; } diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java index c8d59b35e0..887f2635ba 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java @@ -374,7 +374,7 @@ public final class GifSearchViewModel extends AppViewModel { /* JADX WARNING: Illegal instructions before constructor call */ public /* synthetic */ GifSearchViewModel(Context context, BehaviorSubject behaviorSubject, StoreGifPicker storeGifPicker, StoreAnalytics storeAnalytics, MessageManager messageManager, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) { - this(context, r0, r1, r2, (i & 16) != 0 ? new MessageManager(context, null, null, null, null, null, null, null, 254, null) : messageManager, (i & 32) != 0 ? Companion.access$observeStoreState(Companion, r0, r2, r1) : observable); + this(context, r0, r1, r2, (i & 16) != 0 ? new MessageManager(context, null, null, null, null, null, null, null, null, 510, null) : messageManager, (i & 32) != 0 ? Companion.access$observeStoreState(Companion, r0, r2, r1) : observable); BehaviorSubject behaviorSubject2; if ((i & 2) != 0) { behaviorSubject2 = BehaviorSubject.l0(""); diff --git a/app/src/main/java/com/discord/widgets/chat/input/models/AttachmentOptionValue.java b/app/src/main/java/com/discord/widgets/chat/input/models/AttachmentOptionValue.java new file mode 100644 index 0000000000..66b7483469 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/chat/input/models/AttachmentOptionValue.java @@ -0,0 +1,19 @@ +package com.discord.widgets.chat.input.models; + +import androidx.core.app.NotificationCompat; +import d0.z.d.m; +/* compiled from: CommandOptionValue.kt */ +public final class AttachmentOptionValue extends CommandOptionValue { + private final String uri; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AttachmentOptionValue(String str) { + super(str, null); + m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI); + this.uri = str; + } + + public final String getUri() { + return this.uri; + } +} diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$viewModelForInline$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$viewModelForInline$2.java index 5fd07ece60..ee9b1ff9ea 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$viewModelForInline$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$viewModelForInline$2.java @@ -21,7 +21,7 @@ public final class WidgetStickerPicker$viewModelForInline$2 extends o implements /* renamed from: invoke */ public final AppViewModel mo1invoke() { Locale primaryLocale = new LocaleManager().getPrimaryLocale(this.this$0.requireContext()); - MessageManager messageManager = new MessageManager(this.this$0.requireContext(), null, null, null, null, null, null, null, 254, null); + MessageManager messageManager = new MessageManager(this.this$0.requireContext(), null, null, null, null, null, null, null, null, 510, null); Long access$getInitialStickerPackId$p = WidgetStickerPicker.access$getInitialStickerPackId$p(this.this$0); return new StickerPickerInlineViewModel(primaryLocale, messageManager, access$getInitialStickerPackId$p != null ? access$getInitialStickerPackId$p.longValue() : -1); } diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$viewModelForSheet$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$viewModelForSheet$2.java index 81d901f8c5..86081fbe83 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$viewModelForSheet$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$viewModelForSheet$2.java @@ -21,7 +21,7 @@ public final class WidgetStickerPicker$viewModelForSheet$2 extends o implements /* renamed from: invoke */ public final AppViewModel mo1invoke() { Locale primaryLocale = new LocaleManager().getPrimaryLocale(this.this$0.requireContext()); - MessageManager messageManager = new MessageManager(this.this$0.requireContext(), null, null, null, null, null, null, null, 254, null); + MessageManager messageManager = new MessageManager(this.this$0.requireContext(), null, null, null, null, null, null, null, null, 510, null); Long access$getInitialStickerPackId$p = WidgetStickerPicker.access$getInitialStickerPackId$p(this.this$0); return new StickerPickerSheetViewModel(primaryLocale, messageManager, access$getInitialStickerPackId$p != null ? access$getInitialStickerPackId$p.longValue() : -1); } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java index 066f821c8d..4fd7a51f40 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java @@ -334,7 +334,7 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA /* JADX WARNING: Illegal instructions before constructor call */ public /* synthetic */ WidgetChatListAdapterEventsHandler(AppFragment appFragment, AppFlexInputViewModel appFlexInputViewModel, StoreChat storeChat, StoreMessages storeMessages, StorePendingReplies storePendingReplies, StoreUser storeUser, StoreEmoji storeEmoji, MessageManager messageManager, ChannelSelector channelSelector, UserReactionHandler userReactionHandler, StoreChannels storeChannels, AnalyticsUtils.Tracker tracker, int i, DefaultConstructorMarker defaultConstructorMarker) { - this(appFragment, appFlexInputViewModel, r5, r6, r7, r8, r9, (i & 128) != 0 ? new MessageManager(appFragment.requireContext(), null, null, null, null, null, null, null, 254, null) : messageManager, (i & 256) != 0 ? ChannelSelector.Companion.getInstance() : channelSelector, (i & 512) != 0 ? new UserReactionHandler(appFragment, r6, r9) : userReactionHandler, (i & 1024) != 0 ? StoreStream.Companion.getChannels() : storeChannels, (i & 2048) != 0 ? AnalyticsUtils.Tracker.Companion.getInstance() : tracker); + this(appFragment, appFlexInputViewModel, r5, r6, r7, r8, r9, (i & 128) != 0 ? new MessageManager(appFragment.requireContext(), null, null, null, null, null, null, null, null, 510, null) : messageManager, (i & 256) != 0 ? ChannelSelector.Companion.getInstance() : channelSelector, (i & 512) != 0 ? new UserReactionHandler(appFragment, r6, r9) : userReactionHandler, (i & 1024) != 0 ? StoreStream.Companion.getChannels() : storeChannels, (i & 2048) != 0 ? AnalyticsUtils.Tracker.Companion.getInstance() : tracker); StoreChat chat = (i & 4) != 0 ? StoreStream.Companion.getChat() : storeChat; StoreMessages messages = (i & 8) != 0 ? StoreStream.Companion.getMessages() : storeMessages; StorePendingReplies pendingReplies = (i & 16) != 0 ? StoreStream.Companion.getPendingReplies() : storePendingReplies; diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildScheduledEventInvite$Model$Companion$observe$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildScheduledEventInvite$Model$Companion$observe$1.java index 27fb7c0bb5..0b64f2d116 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildScheduledEventInvite$Model$Companion$observe$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildScheduledEventInvite$Model$Companion$observe$1.java @@ -51,7 +51,7 @@ public final class WidgetChatListAdapterItemGuildScheduledEventInvite$Model$Comp Guild guild = null; if (channel2 != null) { com.discord.api.guild.Guild guild2 = this.$item.getInvite().getGuild(); - channel = Channel.a(channel2, null, 0, guild2 != null ? guild2.p() : 0, 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); + channel = Channel.a(channel2, null, 0, guild2 != null ? guild2.q() : 0, 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); } else { channel = null; } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$ModelProvider$observeModel$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$ModelProvider$observeModel$1.java index a7599a725c..340555104e 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$ModelProvider$observeModel$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$ModelProvider$observeModel$1.java @@ -39,7 +39,7 @@ public final class WidgetChatListAdapterItemInvite$ModelProvider$observeModel$1 long id2 = this.$userStore.getMe().getId(); User user = this.$userStore.getUsers().get(Long.valueOf(this.$item.getUserId())); Guild guild = this.$invite.getGuild(); - boolean z2 = (guild != null ? this.$guildStore.getGuilds().get(Long.valueOf(guild.p())) : null) != null; + boolean z2 = (guild != null ? this.$guildStore.getGuilds().get(Long.valueOf(guild.q())) : null) != null; Channel channel = this.$invite.getChannel(); Channel channel2 = channel != null ? this.$channelStore.getChannel(channel.h()) : null; return (this.$invite.getExpirationTime() >= 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 e17d4a886d..58a6eb4348 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,9 +688,9 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter boolean z2; boolean z3; Guild guild; - String v; - String o; - List l; + String w; + String p; + List m; ModelInvite component1 = resolved.component1(); long component2 = resolved.component2(); User component3 = resolved.component3(); @@ -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.s() : 0) < 200; + boolean z5 = (guild2 != null ? guild2.t() : 0) < 200; Channel channel = component1.getChannel(); - boolean w = channel != null ? ChannelUtils.w(channel) : false; + boolean w2 = channel != null ? ChannelUtils.w(channel) : false; Guild guild3 = component1.getGuild(); - boolean z6 = (guild3 == null || (l = guild3.l()) == null || !l.contains(GuildFeature.HUB)) ? false : true; + 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.f1819c; m.checkNotNullExpressionValue(textView, "binding.itemInviteHeader"); String str2 = null; - if (w && z4) { + if (w2 && 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 (w && !z4) { + } else if (w2 && !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 (w) { + if (w2) { 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 (w) { + } else if (w2) { 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.p()) : null; + Long valueOf = guild4 != null ? Long.valueOf(guild4.q()) : null; Guild guild5 = component1.getGuild(); - updateIconUrlIfChanged(IconUtils.getForGuild$default(valueOf, guild5 != null ? guild5.o() : null, IconUtils.DEFAULT_ICON_BLURPLE, resolved.getShouldAnimateGuildIcon(), null, 16, null)); + updateIconUrlIfChanged(IconUtils.getForGuild$default(valueOf, guild5 != null ? guild5.p() : null, IconUtils.DEFAULT_ICON_BLURPLE, resolved.getShouldAnimateGuildIcon(), null, 16, null)); Guild guild6 = component1.getGuild(); - if (!(guild6 == null || (o = guild6.o()) == null)) { - if (o.length() > 0) { + if (!(guild6 == null || (p = guild6.p()) == null)) { + if (p.length() > 0) { z3 = true; TextView textView4 = this.binding.g; m.checkNotNullExpressionValue(textView4, "binding.itemInviteImageText"); - if (!(z3 || (guild = component1.getGuild()) == null || (v = guild.v()) == null)) { - str2 = GuildUtilsKt.computeShortName(v); + if (!(z3 || (guild = component1.getGuild()) == null || (w = guild.w()) == null)) { + str2 = GuildUtilsKt.computeShortName(w); } 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(v); + str2 = GuildUtilsKt.computeShortName(w); ViewExtensions.setTextAndVisibilityBy(textView4, str2); } if (component5 == null && ChannelUtils.t(component5)) { m.checkNotNullExpressionValue(context, "context"); configureForVocalChannel(component5, context); } else { - configureForTextChannel(w, component1); + configureForTextChannel(w2, component1); } - if (w) { + if (w2) { 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.v(); + str = guild7.w(); 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(w, component1); - if (w) { + configureForTextChannel(w2, component1); + if (w2) { } if (!z6) { } @@ -873,8 +873,8 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter } if (component5 == null) { } - configureForTextChannel(w, component1); - if (w) { + configureForTextChannel(w2, component1); + if (w2) { } 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 9efa992d3d..f24d729d29 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.p(); + f = guild.q(); } 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 ec62acc996..8f39406550 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 v; - String o; + String w; + String p; 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.p()) : null; + Long valueOf = guild2 != null ? Long.valueOf(guild2.q()) : null; Guild guild3 = model.getInvite().getGuild(); - updateIconUrlIfChanged(IconUtils.getForGuild$default(valueOf, guild3 != null ? guild3.o() : null, IconUtils.DEFAULT_ICON_BLURPLE, model.getShouldAnimateGuildIcon(), null, 16, null)); + updateIconUrlIfChanged(IconUtils.getForGuild$default(valueOf, guild3 != null ? guild3.p() : null, IconUtils.DEFAULT_ICON_BLURPLE, model.getShouldAnimateGuildIcon(), null, 16, null)); Guild guild4 = model.getInvite().getGuild(); int i = 0; - if (!(guild4 == null || (o = guild4.o()) == null)) { - if (o.length() > 0) { + if (!(guild4 == null || (p = guild4.p()) == null)) { + if (p.length() > 0) { z2 = true; TextView textView = this.binding.e; m.checkNotNullExpressionValue(textView, "binding.itemInviteImageText"); - ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (v = guild.v()) == null) ? null : GuildUtilsKt.computeShortName(v)); + ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (w = guild.w()) == null) ? null : GuildUtilsKt.computeShortName(w)); TextView textView2 = this.binding.f1825c; m.checkNotNullExpressionValue(textView2, "binding.itemInviteGuildName"); Guild guild5 = model.getInvite().getGuild(); - if (guild5 == null || (str = guild5.v()) == null) { + if (guild5 == null || (str = guild5.w()) == 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 || (v = guild.v()) == null) ? null : GuildUtilsKt.computeShortName(v)); + ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (w = guild.w()) == null) ? null : GuildUtilsKt.computeShortName(w)); TextView textView2 = this.binding.f1825c; m.checkNotNullExpressionValue(textView2, "binding.itemInviteGuildName"); Guild guild5 = model.getInvite().getGuild(); @@ -508,7 +508,7 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd stageCardSpeakersView.k.setData(arrayList2); this.binding.f.setOnClickListener(new WidgetChatListAdapterItemStageInvite$configureUI$2(this, model, context)); } - ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (v = guild.v()) == null) ? null : GuildUtilsKt.computeShortName(v)); + ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (w = guild.w()) == null) ? null : GuildUtilsKt.computeShortName(w)); TextView textView2 = this.binding.f1825c; m.checkNotNullExpressionValue(textView2, "binding.itemInviteGuildName"); Guild guild5 = model.getInvite().getGuild(); diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1.java index fc3044369a..aa239adf4a 100644 --- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1.java +++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1.java @@ -33,7 +33,7 @@ public final class WidgetChatOverlay$configureStickerSuggestions$$inlined$forEac m.checkNotNullExpressionValue(view, "it"); Context context = view.getContext(); m.checkNotNullExpressionValue(context, "it.context"); - WidgetChatOverlay.access$getChatInputViewModel$p(this.this$0).sendSticker(this.$sticker, new MessageManager(context, null, null, null, null, null, null, null, 254, null)); + WidgetChatOverlay.access$getChatInputViewModel$p(this.this$0).sendSticker(this.$sticker, new MessageManager(context, null, null, null, null, null, null, null, null, 510, null)); WidgetChatOverlay.access$getFlexInputViewModel$p(this.this$0).onStickerSuggestionSent(this.$shouldClearTextOnSend$inlined); } } 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 8f31e60f60..44268f510f 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 @@ -126,11 +126,11 @@ public final class WidgetGuildClone extends WidgetGuildCreate { list = n.emptyList(); } guildTemplateChannelsView.updateView(list); - List E = serializedSourceGuild.E(); - if (E == null) { - E = n.emptyList(); + List F = serializedSourceGuild.F(); + if (F == null) { + F = n.emptyList(); } - List sortedWith = u.sortedWith(E, new WidgetGuildClone$configureUI$$inlined$sortedBy$2()); + List sortedWith = u.sortedWith(F, new WidgetGuildClone$configureUI$$inlined$sortedBy$2()); ArrayList arrayList = new ArrayList(); for (Object obj : sortedWith) { if (!m.areEqual(((GuildRole) obj).g(), "@everyone")) { @@ -146,7 +146,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.p()); + rolesListView.updateView(arrayList, ColorCompat.getThemedColor(rolesListView2.getContext(), (int) R.attr.primary_300), serializedSourceGuild.q()); } } } 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 bd3c1292eb..246e8e2b39 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.p()) : null; + Long valueOf = guild != null ? Long.valueOf(guild.q()) : 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 0d161ed50e..db9075f08c 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 @@ -1,6 +1,7 @@ package com.discord.widgets.guilds.invite; import android.content.Context; +import androidx.fragment.app.FragmentActivity; import c.a.d.j; import com.discord.R; import com.discord.api.channel.Channel; @@ -43,7 +44,7 @@ import kotlin.jvm.internal.Ref$ObjectRef; import kotlinx.coroutines.CoroutineScope; import retrofit2.HttpException; /* compiled from: InviteJoinHelper.kt */ -@e(c = "com.discord.widgets.guilds.invite.InviteJoinHelper$joinViaInvite$4", f = "InviteJoinHelper.kt", l = {74, 99, 108, 109, 123, 162, 193}, m = "invokeSuspend") +@e(c = "com.discord.widgets.guilds.invite.InviteJoinHelper$joinViaInvite$4", f = "InviteJoinHelper.kt", l = {76, 101, 110, 111, 125, 164, 193}, m = "invokeSuspend") public final class InviteJoinHelper$joinViaInvite$4 extends k implements Function2, Object> { public final /* synthetic */ String $captchaKey; public final /* synthetic */ AppFragment $fragment; @@ -84,21 +85,21 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio return ((InviteJoinHelper$joinViaInvite$4) create(coroutineScope, continuation)).invokeSuspend(Unit.a); } - /* JADX WARNING: Removed duplicated region for block: B:104:0x0276 */ - /* JADX WARNING: Removed duplicated region for block: B:117:0x02c1 */ - /* JADX WARNING: Removed duplicated region for block: B:121:0x02d2 */ - /* JADX WARNING: Removed duplicated region for block: B:151:0x0369 */ - /* JADX WARNING: Removed duplicated region for block: B:152:0x0377 */ - /* JADX WARNING: Removed duplicated region for block: B:164:0x03cb */ - /* JADX WARNING: Removed duplicated region for block: B:167:0x03de A[RETURN] */ - /* JADX WARNING: Removed duplicated region for block: B:69:0x01a2 */ - /* JADX WARNING: Removed duplicated region for block: B:74:0x01af */ - /* JADX WARNING: Removed duplicated region for block: B:79:0x01d5 */ - /* JADX WARNING: Removed duplicated region for block: B:80:0x01d7 */ - /* JADX WARNING: Removed duplicated region for block: B:82:0x01da */ - /* JADX WARNING: Removed duplicated region for block: B:87:0x01f5 */ - /* JADX WARNING: Removed duplicated region for block: B:94:0x023e A[RETURN] */ - /* JADX WARNING: Removed duplicated region for block: B:95:0x023f */ + /* JADX WARNING: Removed duplicated region for block: B:104:0x027f */ + /* JADX WARNING: Removed duplicated region for block: B:117:0x02ca */ + /* JADX WARNING: Removed duplicated region for block: B:121:0x02db */ + /* JADX WARNING: Removed duplicated region for block: B:151:0x0372 */ + /* JADX WARNING: Removed duplicated region for block: B:152:0x0380 */ + /* JADX WARNING: Removed duplicated region for block: B:164:0x03d4 */ + /* JADX WARNING: Removed duplicated region for block: B:167:0x03e7 A[RETURN] */ + /* JADX WARNING: Removed duplicated region for block: B:69:0x01ab */ + /* JADX WARNING: Removed duplicated region for block: B:74:0x01b8 */ + /* JADX WARNING: Removed duplicated region for block: B:79:0x01de */ + /* JADX WARNING: Removed duplicated region for block: B:80:0x01e0 */ + /* JADX WARNING: Removed duplicated region for block: B:82:0x01e3 */ + /* JADX WARNING: Removed duplicated region for block: B:87:0x01fe */ + /* JADX WARNING: Removed duplicated region for block: B:94:0x0247 A[RETURN] */ + /* JADX WARNING: Removed duplicated region for block: B:95:0x0248 */ /* JADX WARNING: Unknown variable types count: 2 */ @Override // d0.w.i.a.a public final Object invokeSuspend(Object obj) { @@ -124,10 +125,11 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio Long boxLong2; Object obj4; Long boxLong3; - List l; - List l2; - List l3; + List m; + List m2; + List m3; Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); + String str = null; switch (this.label) { case 0: l.throwOnFailure(obj); @@ -138,27 +140,35 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio m.checkNotNullExpressionValue(parentFragmentManager, "fragment.parentFragmentManager"); ref$ObjectRef5.element = parentFragmentManager; Guild guild2 = this.$invite.getGuild(); - boolean z4 = (guild2 == null || (l3 = guild2.l()) == null || !l3.contains(GuildFeature.MEMBER_VERIFICATION_GATE_ENABLED)) ? false : true; + boolean z4 = (guild2 == null || (m3 = guild2.m()) == null || !m3.contains(GuildFeature.MEMBER_VERIFICATION_GATE_ENABLED)) ? false : true; Guild guild3 = this.$invite.getGuild(); - boolean z5 = (guild3 == null || (l2 = guild3.l()) == null || l2.contains(GuildFeature.PREVIEW_ENABLED)) ? false : true; + boolean z5 = (guild3 == null || (m2 = guild3.m()) == null || m2.contains(GuildFeature.PREVIEW_ENABLED)) ? false : true; Guild guild4 = this.$invite.getGuild(); - boolean z6 = (guild4 == null || (l = guild4.l()) == null || !l.contains(GuildFeature.HUB)) ? false : true; + boolean z6 = (guild4 == null || (m = guild4.m()) == null || !m.contains(GuildFeature.HUB)) ? false : true; if (z6 && !GrowthTeamFeatures.INSTANCE.isHubEnabled()) { c.a.d.m.g(ref$ObjectRef4.element, R.string.discord_u_coming_soon_to_mobile, 0, null, 12); + return Unit.a; } else if (z6 && GrowthTeamFeatures.INSTANCE.isHubEmailConnectionEnabled()) { Context context = ref$ObjectRef4.element; HubEmailEntryPoint hubEmailEntryPoint = HubEmailEntryPoint.Invite; Guild guild5 = this.$invite.getGuild(); - String v = guild5 != null ? guild5.v() : null; - if (v == null) { - v = ""; + if (guild5 != null) { + str = guild5.w(); } - j.d(context, WidgetHubEmailFlow.class, new HubEmailArgs(v, this.$invite.getApproximateMemberCount(), hubEmailEntryPoint)); + if (str == null) { + str = ""; + } + j.d(context, WidgetHubEmailFlow.class, new HubEmailArgs(str, this.$invite.getApproximateMemberCount(), hubEmailEntryPoint)); + FragmentActivity activity = this.$fragment.getActivity(); + if (activity != null) { + activity.onBackPressed(); + } + return Unit.a; } else if (!z4 || !z5) { ref$ObjectRef2 = ref$ObjectRef4; modelInvite4 = null; guild = this.$invite.getGuild(); - if (((guild != null || (boxLong2 = b.boxLong(guild.p())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) { + if (((guild != null || (boxLong2 = b.boxLong(guild.q())) == 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; @@ -176,15 +186,15 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio if (channel != null) { m.checkNotNullExpressionValue(channel, "channel"); if (ChannelUtils.t(channel)) { - Long l4 = StoreStream.Companion.getPermissions().getPermissionsByChannel().get(b.boxLong(channel.h())); - if ((l4 == null || (boxBoolean2 = b.boxBoolean(PermissionUtils.can(Permission.CONNECT, b.boxLong(l4.longValue())))) == null) ? false : boxBoolean2.booleanValue()) { + Long l = StoreStream.Companion.getPermissions().getPermissionsByChannel().get(b.boxLong(channel.h())); + if ((l == null || (boxBoolean2 = b.boxBoolean(PermissionUtils.can(Permission.CONNECT, b.boxLong(l.longValue())))) == null) ? false : boxBoolean2.booleanValue()) { z3 = true; boxBoolean = b.boxBoolean(z3); if (boxBoolean != null) { z2 = boxBoolean.booleanValue(); if (this.$invite.getGuild() != null) { Guild guild6 = this.$invite.getGuild(); - if (((guild6 == null || (boxLong = b.boxLong(guild6.p())) == null) ? 0 : boxLong.longValue()) > 0) { + if (((guild6 == null || (boxLong = b.boxLong(guild6.q())) == null) ? 0 : boxLong.longValue()) > 0) { if (this.$invite.getGuildScheduledEvent() != null) { GuildScheduledEvent guildScheduledEvent = this.$invite.getGuildScheduledEvent(); if ((guildScheduledEvent != null ? guildScheduledEvent.l() : null) != GuildScheduledEventStatus.ACTIVE) { @@ -409,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.p())) == 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.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)); obj4 = gVar2.getOrThrow(); if (obj4 == c.getCOROUTINE_SUSPENDED()) { d0.w.i.a.g.probeCoroutineSuspended(this); @@ -423,21 +433,10 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio return Unit.a; } guild = this.$invite.getGuild(); - if (((guild != null || (boxLong2 = b.boxLong(guild.p())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) { + if (((guild != null || (boxLong2 = b.boxLong(guild.q())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) { } } - modelInvite = null; - function2 = this.$onInviteFlowFinished; - if (modelInvite == null) { - } - this.L$0 = null; - this.L$1 = null; - this.L$2 = null; - this.L$3 = null; - this.label = 7; - if (function2.invoke(modelInvite, this) == coroutine_suspended) { - } - return Unit.a; + break; case 1: InviteJoinHelper$joinViaInvite$4 inviteJoinHelper$joinViaInvite$4 = (InviteJoinHelper$joinViaInvite$4) this.L$3; Ref$ObjectRef ref$ObjectRef6 = (Ref$ObjectRef) this.L$1; @@ -448,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.p())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) { + if (((guild != null || (boxLong2 = b.boxLong(guild.q())) == 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 4c12081099..021c4b3c4d 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 @@ -68,7 +68,7 @@ public final class InviteJoinHelper { private final void navigateToGuild(ModelInvite modelInvite) { Guild guild = modelInvite.getGuild(); if (guild != null) { - StoreStream.Companion.getGuildSelected().set(guild.p()); + StoreStream.Companion.getGuildSelected().set(guild.q()); } GuildScheduledEvent guildScheduledEvent = modelInvite.getGuildScheduledEvent(); if (guildScheduledEvent != null) { diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2.java index ecd0efb14f..ce8c2fd20a 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$2.java @@ -100,7 +100,7 @@ public final class WidgetGuildInvite$configureUI$2 implements View.OnClickListen 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.p()) : null : null; + Long boxLong = b.boxBoolean(modelInvite.isNewMember()).booleanValue() ? guild != null ? b.boxLong(guild.q()) : 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 02124df287..46de6e02e0 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 p = (invite2 == null || (guild = invite2.getGuild()) == null) ? 0 : guild.p(); + long q = (invite2 == null || (guild = invite2.getGuild()) == null) ? 0 : guild.q(); 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(p, arrayList2, arrayList4); + analyticsTracker.inviteSuggestionOpened(q, arrayList2, arrayList4); this.hasTrackedSuggestionsViewed = true; } TextView textView = getBinding().f1889c; 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 98fd34a6b5..b7a9206bf8 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 p = (invite2 == null || (guild = invite2.getGuild()) == null) ? 0 : guild.p(); + long q = (invite2 == null || (guild = invite2.getGuild()) == null) ? 0 : guild.q(); 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(p, arrayList2, arrayList4); + analyticsTracker.inviteSuggestionOpened(q, arrayList2, arrayList4); this.hasTrackedSuggestionsViewed = true; } TextView textView = getBinding().f1890c; 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 2316130123..bfe0009bae 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 @@ -185,15 +185,15 @@ public final class WidgetInviteInfo extends ConstraintLayout { } private final void configureForGuild(ModelInvite modelInvite) { - List l; - List l2; + List m; + List m2; int i = 0; boolean z2 = modelInvite.getInviter() != null && modelInvite.getApproximateMemberCount() < 200; Guild guild = modelInvite.getGuild(); 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.v())); + guildView.a(IconUtils.getForGuild$default(new com.discord.models.guild.Guild(guild), null, true, null, 10, null), GuildUtilsKt.computeShortName(guild.w())); } String str = null; if (z2) { @@ -213,15 +213,15 @@ public final class WidgetInviteInfo extends ConstraintLayout { TextView textView = this.binding.e; m.checkNotNullExpressionValue(textView, "binding.inviteMessage"); Guild guild2 = modelInvite.getGuild(); - String v = guild2 != null ? guild2.v() : null; - if (v == null) { - v = ""; + String w = guild2 != null ? guild2.w() : null; + if (w == null) { + w = ""; } - textView.setText(getFormattedGuildName(v)); + textView.setText(getFormattedGuildName(w)); Guild guild3 = modelInvite.getGuild(); - if (guild3 == null || (l2 = guild3.l()) == null || !l2.contains(GuildFeature.VERIFIED)) { + if (guild3 == null || (m2 = guild3.m()) == null || !m2.contains(GuildFeature.VERIFIED)) { Guild guild4 = modelInvite.getGuild(); - if (!(guild4 == null || (l = guild4.l()) == null || !l.contains(GuildFeature.PARTNERED))) { + if (!(guild4 == null || (m = guild4.m()) == null || !m.contains(GuildFeature.PARTNERED))) { TextView textView2 = this.binding.e; m.checkNotNullExpressionValue(textView2, "binding.inviteMessage"); ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView2, R.drawable.ic_partnered_badge, 0, 0, 0, 14, null); diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1.java new file mode 100644 index 0000000000..8fa098d6e0 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1.java @@ -0,0 +1,67 @@ +package com.discord.widgets.guildscheduledevent; + +import android.text.style.ForegroundColorSpan; +import com.discord.i18n.Hook; +import com.discord.i18n.RenderContext; +import com.discord.utilities.guildscheduledevent.GuildScheduledEventTiming; +import d0.z.d.m; +import d0.z.d.o; +import java.util.List; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: GuildScheduledEventDateView.kt */ +public final class GuildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1 extends o implements Function1 { + public final /* synthetic */ CharSequence $eventEndingTimeString$inlined; + public final /* synthetic */ CharSequence $eventStartingTimeString$inlined; + public final /* synthetic */ GuildScheduledEventTiming $timing$inlined; + public final /* synthetic */ GuildScheduledEventDateView this$0; + + /* compiled from: GuildScheduledEventDateView.kt */ + /* renamed from: com.discord.widgets.guildscheduledevent.GuildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function1 { + public final /* synthetic */ GuildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(GuildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1 guildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1) { + super(1); + this.this$0 = guildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$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 // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Hook hook) { + invoke(hook); + return Unit.a; + } + + public final void invoke(Hook hook) { + m.checkNotNullParameter(hook, "$receiver"); + List list = hook.a; + GuildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1 guildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1 = this.this$0; + list.add(new ForegroundColorSpan(GuildScheduledEventDateView.access$getTextColorViaTiming(guildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1.this$0, guildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1.$timing$inlined))); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public GuildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1(GuildScheduledEventDateView guildScheduledEventDateView, CharSequence charSequence, CharSequence charSequence2, GuildScheduledEventTiming guildScheduledEventTiming) { + super(1); + this.this$0 = guildScheduledEventDateView; + this.$eventStartingTimeString$inlined = charSequence; + this.$eventEndingTimeString$inlined = charSequence2; + this.$timing$inlined = guildScheduledEventTiming; + } + + /* 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(RenderContext renderContext) { + invoke(renderContext); + return Unit.a; + } + + public final void invoke(RenderContext renderContext) { + m.checkNotNullParameter(renderContext, "$receiver"); + renderContext.a("startHook", new AnonymousClass1(this)); + } +} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventDateView.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventDateView.java index 22a4469743..f13e9c3616 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventDateView.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventDateView.java @@ -6,15 +6,19 @@ import android.view.LayoutInflater; import android.widget.ImageView; import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; +import c.a.k.b; import com.discord.R; import com.discord.api.guildscheduledevent.GuildScheduledEvent; +import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType; import com.discord.api.guildscheduledevent.GuildScheduledEventStatus; +import com.discord.api.utcdatetime.UtcDateTime; import com.discord.databinding.GuildScheduledEventDateViewBinding; import com.discord.utilities.color.ColorCompat; import com.discord.utilities.color.ColorCompatKt; import com.discord.utilities.guildscheduledevent.GuildScheduledEventTiming; import com.discord.utilities.guildscheduledevent.GuildScheduledEventUtilitiesKt; import d0.z.d.m; +import java.util.Objects; /* compiled from: GuildScheduledEventDateView.kt */ public final class GuildScheduledEventDateView extends ConstraintLayout { private final GuildScheduledEventDateViewBinding binding; @@ -74,70 +78,104 @@ public final class GuildScheduledEventDateView extends ConstraintLayout { this.binding = a; } - /* JADX WARNING: Removed duplicated region for block: B:13:0x005a */ - /* JADX WARNING: Removed duplicated region for block: B:15:0x0068 */ - private final void configureViaTiming(GuildScheduledEventTiming guildScheduledEventTiming, CharSequence charSequence) { - int ordinal; - int i; + public static final /* synthetic */ int access$getTextColorViaTiming(GuildScheduledEventDateView guildScheduledEventDateView, GuildScheduledEventTiming guildScheduledEventTiming) { + return guildScheduledEventDateView.getTextColorViaTiming(guildScheduledEventTiming); + } + + private final void configureCompleteTimeString(GuildScheduledEventTiming guildScheduledEventTiming, long j, long j2, GuildScheduledEventEntityType guildScheduledEventEntityType, GuildScheduledEventStatus guildScheduledEventStatus) { + Context context = getContext(); + m.checkNotNullExpressionValue(context, "context"); + CharSequence eventEndingTimeString = GuildScheduledEventUtilitiesKt.getEventEndingTimeString(context, j, j2, guildScheduledEventStatus); + if (eventEndingTimeString == null || eventEndingTimeString.length() == 0) { + configureStartingTimeString(guildScheduledEventTiming, j, guildScheduledEventEntityType, guildScheduledEventStatus); + return; + } + Context context2 = getContext(); + m.checkNotNullExpressionValue(context2, "context"); + CharSequence eventStartingTimeString = GuildScheduledEventUtilitiesKt.getEventStartingTimeString(context2, j, guildScheduledEventEntityType, guildScheduledEventStatus); + TextView textView = this.binding.f1669c; + textView.setTextColor(ColorCompat.getThemedColor(textView.getContext(), (int) R.attr.colorHeaderSecondary)); + Context context3 = textView.getContext(); + m.checkNotNullExpressionValue(context3, "context"); + textView.setText(b.b(context3, R.string.start_date_to_end_date_with_color, new Object[]{eventStartingTimeString, eventEndingTimeString}, new GuildScheduledEventDateView$configureCompleteTimeString$$inlined$apply$lambda$1(this, eventStartingTimeString, eventEndingTimeString, guildScheduledEventTiming))); + m.checkNotNullExpressionValue(textView, "binding.guildScheduledEv… }\n }\n }"); + } + + private final void configureFinishedEvent(long j, GuildScheduledEventEntityType guildScheduledEventEntityType, GuildScheduledEventStatus guildScheduledEventStatus) { ImageView imageView = this.binding.b; - int ordinal2 = guildScheduledEventTiming.ordinal(); - if (!(ordinal2 == 3 || ordinal2 == 4)) { - if (ordinal2 == 5) { + imageView.setImageResource(R.drawable.ic_event_20dp); + ColorCompatKt.tintWithColor(imageView, ColorCompat.getThemedColor(imageView.getContext(), (int) R.attr.colorControlBrandForegroundNew)); + TextView textView = this.binding.f1669c; + textView.setTextColor(ColorCompat.getThemedColor(textView.getContext(), (int) R.attr.colorHeaderSecondary)); + Context context = textView.getContext(); + m.checkNotNullExpressionValue(context, "context"); + textView.setText(GuildScheduledEventUtilitiesKt.getEventStartingTimeString(context, j, guildScheduledEventEntityType, guildScheduledEventStatus)); + } + + private final void configureStartingTimeString(GuildScheduledEventTiming guildScheduledEventTiming, long j, GuildScheduledEventEntityType guildScheduledEventEntityType, GuildScheduledEventStatus guildScheduledEventStatus) { + TextView textView = this.binding.f1669c; + Context context = textView.getContext(); + m.checkNotNullExpressionValue(context, "context"); + textView.setText(GuildScheduledEventUtilitiesKt.getEventStartingTimeString(context, j, guildScheduledEventEntityType, guildScheduledEventStatus)); + textView.setTextColor(getTextColorViaTiming(guildScheduledEventTiming)); + } + + /* JADX WARNING: Removed duplicated region for block: B:12:0x0052 */ + /* JADX WARNING: Removed duplicated region for block: B:13:0x005a */ + private final void configureViaTiming(long j, Long l, GuildScheduledEventEntityType guildScheduledEventEntityType, GuildScheduledEventStatus guildScheduledEventStatus) { + GuildScheduledEventTiming eventTiming = GuildScheduledEventUtilitiesKt.getEventTiming(j, guildScheduledEventStatus); + ImageView imageView = this.binding.b; + int ordinal = eventTiming.ordinal(); + if (!(ordinal == 3 || ordinal == 4)) { + if (ordinal == 5) { imageView.setImageResource(R.drawable.ic_event_20dp); ColorCompatKt.tintWithColor(imageView, ColorCompat.getColor(imageView.getContext(), (int) R.color.status_green_600)); - } else if (ordinal2 != 6) { + } else if (ordinal != 6) { imageView.setImageResource(R.drawable.ic_event_20dp); ColorCompatKt.tintWithColor(imageView, ColorCompat.getThemedColor(imageView.getContext(), (int) R.attr.colorControlBrandForegroundNew)); } - TextView textView = this.binding.f1669c; - ordinal = guildScheduledEventTiming.ordinal(); - if (!(ordinal == 3 || ordinal == 4)) { - if (ordinal != 5) { - i = ColorCompat.getColor(textView.getContext(), (int) R.color.status_green_600); - } else if (ordinal != 6) { - i = ColorCompat.getThemedColor(textView.getContext(), (int) R.attr.colorHeaderSecondary); - } - textView.setTextColor(i); - textView.setText(charSequence); + if (l != null) { + configureStartingTimeString(eventTiming, j, guildScheduledEventEntityType, guildScheduledEventStatus); + return; + } else { + configureCompleteTimeString(eventTiming, j, l.longValue(), guildScheduledEventEntityType, guildScheduledEventStatus); + return; } - i = ColorCompat.getThemedColor(textView.getContext(), (int) R.attr.colorControlBrandForegroundNew); - textView.setTextColor(i); - textView.setText(charSequence); } imageView.setImageResource(R.drawable.ic_clock_20dp); ColorCompatKt.tintWithColor(imageView, ColorCompat.getThemedColor(imageView.getContext(), (int) R.attr.colorControlBrandForegroundNew)); - TextView textView = this.binding.f1669c; - ordinal = guildScheduledEventTiming.ordinal(); - if (ordinal != 5) { + if (l != null) { } - textView.setTextColor(i); - textView.setText(charSequence); } - public final void configure(long j) { - GuildScheduledEventTiming eventTiming = GuildScheduledEventUtilitiesKt.getEventTiming(j); - Context context = getContext(); - m.checkNotNullExpressionValue(context, "context"); - configureViaTiming(eventTiming, GuildScheduledEventUtilitiesKt.getEventStartingTimeString(j, context)); + private final int getTextColorViaTiming(GuildScheduledEventTiming guildScheduledEventTiming) { + int ordinal = guildScheduledEventTiming.ordinal(); + if (!(ordinal == 3 || ordinal == 4)) { + if (ordinal == 5) { + return ColorCompat.getColor(getContext(), (int) R.color.status_green_600); + } + if (ordinal != 6) { + return ColorCompat.getThemedColor(getContext(), (int) R.attr.colorHeaderSecondary); + } + } + return ColorCompat.getThemedColor(getContext(), (int) R.attr.colorControlBrandForegroundNew); + } + + public final void configure(long j, Long l, GuildScheduledEventEntityType guildScheduledEventEntityType, GuildScheduledEventStatus guildScheduledEventStatus) { + m.checkNotNullParameter(guildScheduledEventEntityType, "entityType"); + m.checkNotNullParameter(guildScheduledEventStatus, "status"); + Objects.requireNonNull(GuildScheduledEventStatus.Companion); + if (GuildScheduledEventStatus.access$getDONE$cp().contains(guildScheduledEventStatus)) { + configureFinishedEvent(j, guildScheduledEventEntityType, guildScheduledEventStatus); + } else { + configureViaTiming(j, l, guildScheduledEventEntityType, guildScheduledEventStatus); + } } public final void configure(GuildScheduledEvent guildScheduledEvent) { m.checkNotNullParameter(guildScheduledEvent, "event"); - if (guildScheduledEvent.l() == GuildScheduledEventStatus.CANCELED || guildScheduledEvent.l() == GuildScheduledEventStatus.COMPLETED) { - ImageView imageView = this.binding.b; - imageView.setImageResource(R.drawable.ic_event_20dp); - ColorCompatKt.tintWithColor(imageView, ColorCompat.getThemedColor(imageView.getContext(), (int) R.attr.colorControlBrandForegroundNew)); - TextView textView = this.binding.f1669c; - textView.setTextColor(ColorCompat.getThemedColor(textView.getContext(), (int) R.attr.colorHeaderSecondary)); - Context context = textView.getContext(); - m.checkNotNullExpressionValue(context, "context"); - textView.setText(GuildScheduledEventUtilitiesKt.getEventStartingTimeString(guildScheduledEvent, context)); - m.checkNotNullExpressionValue(textView, "binding.guildScheduledEv…meString(context)\n }"); - return; - } - GuildScheduledEventTiming eventTiming = GuildScheduledEventUtilitiesKt.getEventTiming(guildScheduledEvent); - Context context2 = getContext(); - m.checkNotNullExpressionValue(context2, "context"); - configureViaTiming(eventTiming, GuildScheduledEventUtilitiesKt.getEventStartingTimeString(guildScheduledEvent, context2)); + long g = guildScheduledEvent.k().g(); + UtcDateTime j = guildScheduledEvent.j(); + configure(g, j != null ? Long.valueOf(j.g()) : null, guildScheduledEvent.f(), guildScheduledEvent.l()); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java index f03252c683..41da9b12dd 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java @@ -270,8 +270,17 @@ public final class GuildScheduledEventItemView extends ConstraintLayout { } public final void configureAsPreview(GuildScheduledEventModel guildScheduledEventModel, Channel channel, UserGuildMember userGuildMember) { + Long l; m.checkNotNullParameter(guildScheduledEventModel, "eventModel"); - long millis = GuildScheduledEventPickerDateTime.INSTANCE.toMillis(guildScheduledEventModel.getStartDate(), guildScheduledEventModel.getStartTime()); + GuildScheduledEventPickerDateTime guildScheduledEventPickerDateTime = GuildScheduledEventPickerDateTime.INSTANCE; + long millis = guildScheduledEventPickerDateTime.toMillis(guildScheduledEventModel.getStartDate(), guildScheduledEventModel.getStartTime()); + GuildScheduledEventPickerDate endDate = guildScheduledEventModel.getEndDate(); + if (endDate != null) { + GuildScheduledEventPickerTime endTime = guildScheduledEventModel.getEndTime(); + l = endTime != null ? Long.valueOf(guildScheduledEventPickerDateTime.toMillis(endDate, endTime)) : null; + } else { + l = null; + } ConstraintLayout constraintLayout = this.binding.a; m.checkNotNullExpressionValue(constraintLayout, "binding.root"); constraintLayout.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.bg_guild_scheduled_event_list_item_floating)); @@ -292,7 +301,7 @@ public final class GuildScheduledEventItemView extends ConstraintLayout { m.checkNotNullExpressionValue(textView3, "binding.guildScheduledEventListItemTitleText"); textView3.setText(guildScheduledEventModel.getName()); configureDescription(guildScheduledEventModel.getDescription(), guildScheduledEventModel.getGuildId()); - this.binding.e.configure(millis); + this.binding.e.configure(millis, l, guildScheduledEventModel.getEntityType(), GuildScheduledEventStatus.SCHEDULED); configureLocation$default(this, GuildScheduledEventLocationInfo.Companion.buildLocationInfo(guildScheduledEventModel, channel), null, 2, null); } 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 1a6a70d47b..962b8dcd83 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().p()))); + activity.setResult(-1, d.e2(new AuthenticationResult(invoke.a().q()))); activity.finish(); } StoreStream.Companion.getNux().updateNux(WidgetHubAuthentication$configureUi$1$1$2.INSTANCE); 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 12dbc36fe5..4d0b741aaf 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.p()).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE); + Observable F = StoreStream.Companion.getGuilds().observeGuild(guild.q()).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 fb73322c98..dccdeca985 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.p(), 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.q(), 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 01481a8b54..2e1a890b7c 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 + " - 102.2 - Alpha (102202)"); + textView.setText(string + " - 102.3 - Alpha (102203)"); 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/voice/sheet/WidgetVoiceBottomSheet$viewModel$2.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$viewModel$2.java index 3089c24bc2..99cfc8c422 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$viewModel$2.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$viewModel$2.java @@ -17,6 +17,6 @@ public final class WidgetVoiceBottomSheet$viewModel$2 extends o implements Funct @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final AppViewModel mo1invoke() { - return new WidgetVoiceBottomSheetViewModel(WidgetVoiceBottomSheet.access$getChannelId$p(this.this$0), WidgetVoiceBottomSheet.access$getForwardToFullscreenIfVideoActivated$p(this.this$0), null, null, null, null, null, null, null, null, null, null, null, null, null, null, 65532, null); + return new WidgetVoiceBottomSheetViewModel(WidgetVoiceBottomSheet.access$getChannelId$p(this.this$0), WidgetVoiceBottomSheet.access$getForwardToFullscreenIfVideoActivated$p(this.this$0), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 131068, null); } } diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1.java index dd95efc283..eb3d666674 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1.java @@ -1,6 +1,8 @@ package com.discord.widgets.voice.sheet; import com.discord.api.channel.Channel; +import com.discord.models.embeddedactivities.EmbeddedActivity; +import com.discord.stores.StoreEmbeddedActivities; import com.discord.stores.StoreMediaSettings; import com.discord.stores.StorePermissions; import com.discord.widgets.chat.list.TextInVoiceFeatureFlag; @@ -9,19 +11,21 @@ import com.discord.widgets.voice.sheet.WidgetVoiceBottomSheetViewModel; import d0.t.n0; import d0.z.d.m; import j0.k.b; +import java.util.Map; import rx.Observable; -import rx.functions.Func3; +import rx.functions.Func4; /* compiled from: WidgetVoiceBottomSheetViewModel.kt */ public final class WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1 implements b> { public final /* synthetic */ long $channelId; + public final /* synthetic */ StoreEmbeddedActivities $embeddedActivitiesStore; public final /* synthetic */ StorePermissions $permissionsStore; /* compiled from: WidgetVoiceBottomSheetViewModel.kt */ /* renamed from: com.discord.widgets.voice.sheet.WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1$1 reason: invalid class name */ - public static final class AnonymousClass1 implements Func3 { + public static final class AnonymousClass1 implements Func4, WidgetVoiceBottomSheetViewModel.StoreState> { public static final AnonymousClass1 INSTANCE = new AnonymousClass1(); - public final WidgetVoiceBottomSheetViewModel.StoreState call(CallModel callModel, Long l, Boolean bool) { + public final WidgetVoiceBottomSheetViewModel.StoreState call(CallModel callModel, Long l, Boolean bool, Map map) { if (callModel != null) { boolean z2 = false; if (n0.setOf((Object[]) new Integer[]{2, 13, 1, 3}).contains(Integer.valueOf(callModel.getChannel().A()))) { @@ -30,19 +34,29 @@ public final class WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1 } Boolean valueOf = Boolean.valueOf(z2); m.checkNotNullExpressionValue(bool, "textInVoiceEnabled"); - return new WidgetVoiceBottomSheetViewModel.StoreState.Valid(callModel, valueOf, l, bool.booleanValue()); + boolean booleanValue = bool.booleanValue(); + m.checkNotNullExpressionValue(map, "embeddedActivitiesForChannel"); + return new WidgetVoiceBottomSheetViewModel.StoreState.Valid(callModel, valueOf, l, booleanValue, map); } } return WidgetVoiceBottomSheetViewModel.StoreState.Invalid.INSTANCE; } + + /* 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] */ + @Override // rx.functions.Func4 + public /* bridge */ /* synthetic */ WidgetVoiceBottomSheetViewModel.StoreState call(CallModel callModel, Long l, Boolean bool, Map map) { + return call(callModel, l, bool, (Map) map); + } } - public WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1(long j, StorePermissions storePermissions) { + public WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1(long j, StorePermissions storePermissions, StoreEmbeddedActivities storeEmbeddedActivities) { this.$channelId = j; this.$permissionsStore = storePermissions; + this.$embeddedActivitiesStore = storeEmbeddedActivities; } public final Observable call(Channel channel) { - return Observable.i(CallModel.Companion.get(this.$channelId), this.$permissionsStore.observePermissionsForChannel(this.$channelId), TextInVoiceFeatureFlag.Companion.getINSTANCE().observeEnabled(channel != null ? Long.valueOf(channel.f()) : null), AnonymousClass1.INSTANCE); + return Observable.h(CallModel.Companion.get(this.$channelId), this.$permissionsStore.observePermissionsForChannel(this.$channelId), TextInVoiceFeatureFlag.Companion.getINSTANCE().observeEnabled(channel != null ? Long.valueOf(channel.f()) : null), this.$embeddedActivitiesStore.observeEmbeddedActivitiesForChannel(this.$channelId), AnonymousClass1.INSTANCE); } } diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1.java index a19ecdf169..8a07ba48c7 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1.java @@ -13,7 +13,7 @@ import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; import rx.subjects.PublishSubject; /* compiled from: WidgetVoiceBottomSheetViewModel.kt */ -@e(c = "com.discord.widgets.voice.sheet.WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1", f = "WidgetVoiceBottomSheetViewModel.kt", l = {169, 177}, m = "invokeSuspend") +@e(c = "com.discord.widgets.voice.sheet.WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1", f = "WidgetVoiceBottomSheetViewModel.kt", l = {179, 187}, m = "invokeSuspend") public final class WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1 extends k implements Function2, Object> { public final /* synthetic */ StoreMediaEngine $mediaEngine; public int label; diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java index 0d31027eee..23e531e463 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java @@ -17,12 +17,14 @@ import com.discord.api.guildscheduledevent.GuildScheduledEvent; import com.discord.app.AppLog; import com.discord.app.AppViewModel; import com.discord.models.domain.ModelApplicationStream; +import com.discord.models.embeddedactivities.EmbeddedActivity; import com.discord.models.guild.Guild; import com.discord.rtcconnection.RtcConnection; import com.discord.stores.StoreApplicationStreamPreviews; import com.discord.stores.StoreApplicationStreaming; import com.discord.stores.StoreCalls; import com.discord.stores.StoreChannels; +import com.discord.stores.StoreEmbeddedActivities; import com.discord.stores.StoreGuilds; import com.discord.stores.StoreMediaEngine; import com.discord.stores.StoreMediaSettings; @@ -71,6 +73,7 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel eventSubject; private Set fetchedPreviews; private final boolean forwardToFullscreenIfVideoActivated; @@ -123,13 +126,13 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel observeStoreState(long j, StorePermissions storePermissions, StoreChannels storeChannels) { - Observable Y = storeChannels.observeChannel(j).Y(new WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1(j, storePermissions)); - m.checkNotNullExpressionValue(Y, "storeChannels.observeCha… }\n }\n }"); + private final Observable observeStoreState(long j, StorePermissions storePermissions, StoreChannels storeChannels, StoreEmbeddedActivities storeEmbeddedActivities) { + Observable Y = storeChannels.observeChannel(j).Y(new WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1(j, storePermissions, storeEmbeddedActivities)); + m.checkNotNullExpressionValue(Y, "channelsStore.observeCha… }\n }\n }"); return Y; } } @@ -675,21 +678,26 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel embeddedActivitiesForChannel; private final Long myPermissions; private final Boolean noiseCancellation; private final boolean textInVoiceEnabled; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public Valid(CallModel callModel, Boolean bool, Long l, boolean z2) { + public Valid(CallModel callModel, Boolean bool, Long l, boolean z2, Map map) { super(null); m.checkNotNullParameter(callModel, "callModel"); + m.checkNotNullParameter(map, "embeddedActivitiesForChannel"); this.callModel = callModel; this.noiseCancellation = bool; this.myPermissions = l; this.textInVoiceEnabled = z2; + this.embeddedActivitiesForChannel = map; } - public static /* synthetic */ Valid copy$default(Valid valid, CallModel callModel, Boolean bool, Long l, boolean z2, int i, Object obj) { + /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: com.discord.widgets.voice.sheet.WidgetVoiceBottomSheetViewModel$StoreState$Valid */ + /* JADX WARN: Multi-variable type inference failed */ + public static /* synthetic */ Valid copy$default(Valid valid, CallModel callModel, Boolean bool, Long l, boolean z2, Map map, int i, Object obj) { if ((i & 1) != 0) { callModel = valid.callModel; } @@ -702,7 +710,10 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel component5() { + return this.embeddedActivitiesForChannel; + } + + public final Valid copy(CallModel callModel, Boolean bool, Long l, boolean z2, Map map) { m.checkNotNullParameter(callModel, "callModel"); - return new Valid(callModel, bool, l, z2); + m.checkNotNullParameter(map, "embeddedActivitiesForChannel"); + return new Valid(callModel, bool, l, z2, map); } public boolean equals(Object obj) { @@ -734,13 +750,17 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel getEmbeddedActivitiesForChannel() { + return this.embeddedActivitiesForChannel; + } + public final Long getMyPermissions() { return this.myPermissions; } @@ -760,18 +780,20 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel map = this.embeddedActivitiesForChannel; + if (map != null) { + i = map.hashCode(); + } + return i5 + i; } public String toString() { @@ -782,7 +804,9 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel observable) { + public WidgetVoiceBottomSheetViewModel(long j, boolean z2, StoreChannels storeChannels, StorePermissions storePermissions, StoreVoiceChannelSelected storeVoiceChannelSelected, StoreMediaSettings storeMediaSettings, StoreMediaEngine storeMediaEngine, StoreUserSettings storeUserSettings, StoreCalls storeCalls, StoreGuilds storeGuilds, VideoPermissionsManager videoPermissionsManager, StoreApplicationStreamPreviews storeApplicationStreamPreviews, VoiceEngineServiceController voiceEngineServiceController, Clock clock, TooltipManager tooltipManager, StoreEmbeddedActivities storeEmbeddedActivities, Observable observable) { super(null, 1, null); m.checkNotNullParameter(storeChannels, "channelStore"); m.checkNotNullParameter(storePermissions, "permissionsStore"); @@ -995,6 +1019,7 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel - + diff --git a/app/src/main/res/layout-v22/guild_scheduled_event_item_view.xml b/app/src/main/res/layout-v22/guild_scheduled_event_item_view.xml index d713f04a20..9634d6cdbd 100644 --- a/app/src/main/res/layout-v22/guild_scheduled_event_item_view.xml +++ b/app/src/main/res/layout-v22/guild_scheduled_event_item_view.xml @@ -1,7 +1,7 @@ - - + + diff --git a/app/src/main/res/layout/guild_scheduled_event_date_view.xml b/app/src/main/res/layout/guild_scheduled_event_date_view.xml index 40b9f17ed2..608138ca82 100644 --- a/app/src/main/res/layout/guild_scheduled_event_date_view.xml +++ b/app/src/main/res/layout/guild_scheduled_event_date_view.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/layout/guild_scheduled_event_item_view.xml b/app/src/main/res/layout/guild_scheduled_event_item_view.xml index ee017f2390..486c26046e 100644 --- a/app/src/main/res/layout/guild_scheduled_event_item_view.xml +++ b/app/src/main/res/layout/guild_scheduled_event_item_view.xml @@ -1,7 +1,7 @@ - - + + diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index feab3ad1cc..21341b0aca 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -98,6 +98,7 @@ ‏‮com.discord.app.AppScrollingViewBehavior‬‏ ‏‮This‬‏ ‏‮may‬‏ ‏‮take‬‏ ‏‮a‬‏ ‏‮moment.‬‏ ‏‮Actions‬‏ + ‏‮Active‬‏ ‏‮Now‬‏ ‏‮Active‬‏ ‏‮on‬‏ ‏‮Mobile‬‏ ‏‮Active‬‏ ‏‮Threads‬‏ ‏‮More‬‏ ‏‮Active‬‏ ‏‮Threads‬‏ @@ -1042,6 +1043,8 @@ ‏‮I‬‏ ‏‮agree‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮[‬‏‏‮{applicationName}‬‏ ‏‮EULA](onClick)‬‏ ‏‮Black‬‏ ‏‮Friday‬‏ ‏‮Deal‬‏ ‏‮Block‬‏ + ‏‮Want‬‏ ‏‮to‬‏ ‏‮block‬‏ ‏‮them?‬‏ + ‏‮If‬‏ ‏‮blocked,‬‏ ‏‮{username}‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮unable‬‏ ‏‮to‬‏ ‏‮message‬‏ ‏‮you.‬‏ ‏‮Blocked‬‏ ‏‮{count}‬‏ ‏‮blocked‬‏ ‏‮{count}‬‏ @@ -2235,6 +2238,7 @@ ‏‮Disable‬‏ ‏‮Account‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮that‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮disable‬‏ ‏‮your‬‏ ‏‮account?‬‏ ‏‮This‬‏ ‏‮will‬‏ ‏‮immediately‬‏ ‏‮log‬‏ ‏‮you‬‏ ‏‮out‬‏ ‏‮and‬‏ ‏‮make‬‏ ‏‮your‬‏ ‏‮account‬‏ ‏‮inaccessible‬‏ ‏‮to‬‏ ‏‮anyone.‬‏ ‏‮Success!‬‏ ‏‮We\'ve‬‏ ‏‮disabled‬‏ ‏‮e-mail‬‏ ‏‮notifications‬‏ ‏‮for‬‏ ‏‮you!‬‏ + ‏‮Time‬‏ ‏‮Out‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮Disable‬‏ ‏‮Sync‬‏ ‏‮Disabling‬‏ ‏‮sync‬‏ ‏‮will‬‏ ‏‮perform‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮expired‬‏ ‏‮sub‬‏ ‏‮behavior‬‏ ‏‮as‬‏ ‏‮if‬‏ ‏‮all‬‏ ‏‮subs‬‏ ‏‮have‬‏ ‏‮expired.‬‏ ‏‮Disabling‬‏ ‏‮sync‬‏ ‏‮will‬‏ ‏‮perform‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮expired‬‏ ‏‮membership‬‏ ‏‮behavior‬‏ ‏‮as‬‏ ‏‮if‬‏ ‏‮all‬‏ ‏‮members‬‏ ‏‮have‬‏ ‏‮expired.‬‏ @@ -2393,6 +2397,11 @@ ‏‮!!‬‏‏‮{username}‬‏‏‮!!‬‏ ‏‮is‬‏ ‏‮playing‬‏ ‏‮!!‬‏‏‮{username}‬‏‏‮!!‬‏ ‏‮is‬‏ ‏‮watching‬‏ ‏‮Join‬‏ ‏‮Activity‬‏ + ‏‮This‬‏ ‏‮server‬‏ ‏‮doesn\'t‬‏ ‏‮have‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮requested‬‏ ‏‮activity‬‏ + ‏‮This‬‏ ‏‮server‬‏ ‏‮has‬‏ ‏‮reached‬‏ ‏‮the‬‏ ‏‮limit‬‏ ‏‮of‬‏ ‏‮concurrent‬‏ ‏‮activities‬‏ ‏‮for‬‏ ‏‮the‬‏ ‏‮current‬‏ ‏‮boost‬‏ ‏‮level‬‏ + ‏‮Unable‬‏ ‏‮to‬‏ ‏‮launch‬‏ ‏‮activity‬‏ + ‏‮This‬‏ ‏‮server‬‏ ‏‮doesn\'t‬‏ ‏‮have‬‏ ‏‮a‬‏ ‏‮high‬‏ ‏‮enough‬‏ ‏‮boosting‬‏ ‏‮level‬‏ ‏‮for‬‏ ‏‮the‬‏ ‏‮requested‬‏ ‏‮activity‬‏ + ‏‮Failed‬‏ ‏‮to‬‏ ‏‮Launch‬‏ ‏‮Activity‬‏ ‏‮Launching‬‏ ‏‮activity‬‏ ‏‮Leave‬‏ ‏‮Activity‬‏ ‏‮Look‬‏ ‏‮for‬‏ ‏‮more‬‏ ‏‮activities‬‏ ‏‮coming‬‏ ‏‮soon!‬‏ @@ -2493,6 +2502,7 @@ ‏‮To‬‏ ‏‮minimize‬‏ ‏‮spam,‬‏ ‏‮members‬‏ ‏‮of‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮must‬‏ ‏‮have‬‏ ‏‮a‬‏ ‏‮verified‬‏ ‏‮email‬‏ ‏‮before‬‏ ‏‮they‬‏ ‏‮can‬‏ ‏‮send‬‏ ‏‮messages.‬‏ ‏‮This‬‏ ‏‮does‬‏ ‏‮not‬‏ ‏‮apply‬‏ ‏‮to‬‏ ‏‮members‬‏ ‏‮with‬‏ ‏‮roles.‬‏ ‏‮Verified‬‏ ‏‮email‬‏ ‏‮required‬‏ ‏‮Your‬‏ ‏‮server‬‏ ‏‮already‬‏ ‏‮meets‬‏ ‏‮or‬‏ ‏‮exceeds‬‏ ‏‮the‬‏ ‏‮verification‬‏ ‏‮level‬‏ ‏‮requirement.‬‏ + ‏‮Remove‬‏ ‏‮Time‬‏ ‏‮Out‬‏ ‏‮From‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮Enable‬‏ ‏‮in-game‬‏ ‏‮overlay.‬‏ ‏‮Enable‬‏ ‏‮Noise‬‏ ‏‮Suppression‬‏ ‏‮Enable‬‏ ‏‮notifications‬‏ @@ -2647,6 +2657,8 @@ ‏‮Open‬‏ ‏‮in‬‏ ‏‮browser‬‏ ‏‮Share‬‏ ‏‮link‬‏ ‏‮Favorite‬‏ + ‏‮You‬‏ ‏‮cannot‬‏ ‏‮have‬‏ ‏‮more‬‏ ‏‮than‬‏ ‏‮{count}‬‏ ‏‮favorites.‬‏ + ‏‮Oh‬‏ ‏‮no!‬‏ ‏‮Miscellaneous‬‏ ‏‮Describe‬‏ ‏‮your‬‏ ‏‮issue‬‏ ‏‮Your‬‏ ‏‮Issue‬‏ @@ -2998,6 +3010,7 @@ ‏‮There‬‏ ‏‮are‬‏ ‏‮no‬‏ ‏‮pending‬‏ ‏‮friend‬‏ ‏‮requests.‬‏ ‏‮Here\'s‬‏ ‏‮Wumpus‬‏ ‏‮for‬‏ ‏‮now.‬‏ ‏‮No‬‏ ‏‮pending‬‏ ‏‮friends‬‏ ‏‮Try‬‏ ‏‮adding‬‏ ‏‮a‬‏ ‏‮friend‬‏ ‏‮with‬‏ ‏‮their‬‏ ‏‮username,‬‏ ‏‮or‬‏ ‏‮scan‬‏ ‏‮to‬‏ ‏‮see‬‏ ‏‮who‬‏ ‏‮is‬‏ ‏‮nearby.‬‏ + ‏‮There‬‏ ‏‮are‬‏ ‏‮no‬‏ ‏‮pending‬‏ ‏‮friend‬‏ ‏‮suggestions.‬‏ ‏‮Here\'s‬‏ ‏‮Wumpus‬‏ ‏‮for‬‏ ‏‮now.‬‏ ‏‮Friend‬‏ ‏‮Suggestions‬‏ ‏‮—‬‏ ‏‮{count}‬‏ ‏‮Offline‬‏ ‏‮—‬‏ ‏‮{offline}‬‏ ‏‮Online‬‏ ‏‮—‬‏ ‏‮{online}‬‏ @@ -3018,6 +3031,7 @@ ‏‮All‬‏ ‏‮Online‬‏ ‏‮Pending‬‏ + ‏‮Suggestions‬‏ ‏‮Share‬‏ ‏‮Scanning‬‏ ‏‮the‬‏ ‏‮airwaves‬‏ ‏‮for‬‏ ‏‮friends.‬‏ ‏‮Make‬‏ ‏‮sure‬‏ ‏‮your‬‏ ‏‮friends‬‏ ‏‮are‬‏ ‏‮on‬‏ ‏‮this‬‏ ‏‮page‬‏ ‏‮and‬‏ ‏‮scanning‬‏ ‏‮too.‬‏ ‏‮Make‬‏ ‏‮sure‬‏ ‏‮your‬‏ ‏‮friends‬‏ ‏‮are‬‏ ‏‮scanning‬‏ ‏‮too!‬‏ @@ -3460,6 +3474,7 @@ ‏‮No,‬‏ ‏‮just‬‏ ‏‮disconnect‬‏ ‏‮Yes,‬‏ ‏‮end‬‏ ‏‮the‬‏ ‏‮event‬‏ ‏‮Do‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮also‬‏ ‏‮end‬‏ ‏‮the‬‏ ‏‮event?‬‏ + ‏‮Ends‬‏ ‏‮at‬‏ ‏‮{time}‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮end‬‏ ‏‮the‬‏ ‏‮event?‬‏ ‏‮{count}‬‏ ‏‮Interested‬‏ ‏‮{count}‬‏ ‏‮interested‬‏ @@ -3541,7 +3556,7 @@ ‏‮Folder‬‏ ‏‮settings‬‏ ‏‮saved!‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮change‬‏ ‏‮how‬‏ ‏‮others‬‏ ‏‮see‬‏ ‏‮you‬‏ ‏‮inside‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮only‬‏ ‏‮(!!‬‏‏‮{guildName}‬‏‏‮!!)‬‏ ‏‮by‬‏ ‏‮setting‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮profile.‬‏ ‏‮Anything‬‏ ‏‮not‬‏ ‏‮set‬‏ ‏‮here‬‏ ‏‮will‬‏ ‏‮show‬‏ ‏‮your‬‏ ‏‮default‬‏ ‏‮user‬‏ ‏‮profile.‬‏ ‏‮Server‬‏ ‏‮Profile‬‏ ‏‮Banner‬‏ - ‏‮Server‬‏ ‏‮Profile‬‏ ‏‮-‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ + ‏‮Server‬‏ ‏‮Profile‬‏ ‏‮-‬‏ ‏‮$[](guildIconHook)‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ ‏‮Set‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar,‬‏ ‏‮profile‬‏ ‏‮banner,‬‏ ‏‮and‬‏ ‏‮about‬‏ ‏‮me‬‏ ‏‮in‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮[Discord‬‏ ‏‮Nitro!](onAndMore)‬‏ ‏‮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?‬‏ @@ -3954,7 +3969,7 @@ ‏‮**Try‬‏ ‏‮an‬‏ ‏‮animated‬‏ ‏‮banner!**‬‏ ‏‮Choose‬‏ ‏‮a‬‏ ‏‮GIF‬‏ ‏‮from‬‏ ‏‮Tenor‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮banner‬‏ ‏‮**NEW!**‬‏ ‏‮Boost‬‏ ‏‮to‬‏ ‏‮Level‬‏ ‏‮3‬‏ ‏‮to‬‏ ‏‮unlock‬‏ ‏‮animated‬‏ ‏‮server‬‏ ‏‮banners.‬‏ ‏‮**NEW!**‬‏ ‏‮Boost‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮Communities‬‏ ‏‮plan‬‏ ‏‮to‬‏ ‏‮unlock‬‏ ‏‮animated‬‏ ‏‮server‬‏ ‏‮banners.‬‏ - ‏‮Try‬‏ ‏‮it‬‏ ‏‮now!‬‏ + ‏‮Try‬‏ ‏‮it!‬‏ ‏‮$[**!!‬‏‏‮{user}‬‏‏‮!!**](userHook)‬‏ ‏‮created‬‏ ‏‮an‬‏ ‏‮announcement‬‏ ‏‮thread‬‏ ‏‮$[**!!‬‏‏‮{target}‬‏‏‮!!**](targetHook)‬‏ ‏‮$[**!!‬‏‏‮{user}‬‏‏‮!!**](userHook)‬‏ ‏‮added‬‏ ‏‮$[**!!‬‏‏‮{target}‬‏‏‮!!**](targetHook)‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮Changed‬‏ ‏‮the‬‏ ‏‮bitrate‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ @@ -6072,8 +6087,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‬‏ @@ -6934,7 +6949,7 @@ ‏‮Get‬‏ ‏‮cool‬‏ ‏‮rewards‬‏ ‏‮for‬‏ ‏‮becoming‬‏ ‏‮a‬‏ ‏‮Booster!‬‏ ‏‮Server‬‏ ‏‮Boost‬‏ ‏‮Monthly‬‏ ‏‮Server‬‏ ‏‮Boost‬‏ ‏‮Yearly‬‏ - ‏‮This‬‏ ‏‮is‬‏ ‏‮a‬‏ ‏‮Boosting‬‏ ‏‮Preview‬‏ + ‏‮This‬‏ ‏‮is‬‏ ‏‮a‬‏ ‏‮Boosting‬‏ ‏‮preview‬‏ ‏‮You‬‏ ‏‮need‬‏ ‏‮**‬‏‏‮{number}‬‏‏‮**‬‏ ‏‮to‬‏ ‏‮unlock‬‏ ‏‮!!‬‏‏‮{tier}‬‏‏‮!!‬‏ ‏‮{subscribers}‬‏‏‮/‬‏‏‮{numRequired}‬‏ ‏‮Ready‬‏ ‏‮to‬‏ ‏‮Boost‬‏ ‏‮this‬‏ ‏‮server?‬‏ @@ -7604,7 +7619,6 @@ ‏‮Remove‬‏ ‏‮Reaction‬‏ ‏‮Remove‬‏ ‏‮!!‬‏‏‮{name}‬‏‏‮!!‬‏ ‏‮Remove‬‏ ‏‮Role‬‏ - ‏‮Remove‬‏ ‏‮Time‬‏ ‏‮Out‬‏ ‏‮From‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮Remove‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮from‬‏ ‏‮Thread‬‏ ‏‮Remove‬‏ ‏‮Vanity‬‏ ‏‮URL‬‏ ‏‮Show‬‏ ‏‮website‬‏ ‏‮preview‬‏ ‏‮info‬‏ ‏‮from‬‏ ‏‮links‬‏ ‏‮pasted‬‏ ‏‮into‬‏ ‏‮chat‬‏ @@ -8324,7 +8338,7 @@ ‏‮Members‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮can‬‏ ‏‮send‬‏ ‏‮text-to-speech‬‏ ‏‮messages‬‏ ‏‮by‬‏ ‏‮starting‬‏ ‏‮a‬‏ ‏‮message‬‏ ‏‮with‬‏ ‏‮/tts.‬‏ ‏‮These‬‏ ‏‮messages‬‏ ‏‮can‬‏ ‏‮be‬‏ ‏‮heard‬‏ ‏‮by‬‏ ‏‮everyone‬‏ ‏‮focused‬‏ ‏‮on‬‏ ‏‮the‬‏ ‏‮channel.‬‏ ‏‮Send‬‏ ‏‮a‬‏ ‏‮wave‬‏ ‏‮Sending‬‏ ‏‮invite…‬‏ - ‏‮Gift‬‏ ‏‮someone‬‏ ‏‮Nitro‬‏ ‏‮to‬‏ ‏‮give‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮games,‬‏ ‏‮perks,‬‏ ‏‮server‬‏ ‏‮boosting‬‏ ‏‮AND‬‏ ‏‮super‬‏ ‏‮powered‬‏ ‏‮chat‬‏ ‏‮features.‬‏ + ‏‮Gift‬‏ ‏‮someone‬‏ ‏‮Nitro‬‏ ‏‮to‬‏ ‏‮give‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮special‬‏ ‏‮perks,‬‏ ‏‮server‬‏ ‏‮boosting‬‏ ‏‮AND‬‏ ‏‮super‬‏ ‏‮powered‬‏ ‏‮chat‬‏ ‏‮features.‬‏ ‏‮Give‬‏ ‏‮the‬‏ ‏‮gift‬‏ ‏‮of‬‏ ‏‮Nitro‬‏ ‏‮Server‬‏ ‏‮Deafen‬‏ ‏‮Server‬‏ ‏‮Deafened‬‏ @@ -8596,6 +8610,7 @@ ‏‮Lil‬‏ ‏‮Yachty‬‏ ‏‮Sounds‬‏ ‏‮[Original‬‏ ‏‮Message‬‏ ‏‮Deleted]‬‏ + ‏‮Blocked‬‏ ‏‮{username}‬‏ ‏‮Speak‬‏ ‏‮Speak‬‏ ‏‮Message‬‏ ‏‮!!‬‏‏‮{name}‬‏‏‮!!‬‏ ‏‮-‬‏ ‏‮Speaker‬‏ @@ -8647,6 +8662,7 @@ ‏‮This‬‏ ‏‮override‬‏ ‏‮is‬‏ ‏‮currently‬‏ ‏‮disabled‬‏ ‏‮for‬‏ ‏‮Stage‬‏ ‏‮channels.‬‏ ‏‮The‬‏ ‏‮setting‬‏ ‏‮is‬‏ ‏‮currently‬‏ ‏‮disabled‬‏ ‏‮for‬‏ ‏‮Stage‬‏ ‏‮Channels.‬‏ ‏‮A‬‏ ‏‮voice‬‏ ‏‮channel‬‏ ‏‮for‬‏ ‏‮hosting‬‏ ‏‮events‬‏ ‏‮with‬‏ ‏‮an‬‏ ‏‮audience‬‏ + ‏‮Happening‬‏ ‏‮Now‬‏ ‏‮Or,‬‏ ‏‮send‬‏ ‏‮a‬‏ ‏‮Stage‬‏ ‏‮invite‬‏ ‏‮link‬‏ ‏‮to‬‏ ‏‮a‬‏ ‏‮friend‬‏ ‏‮Invite‬‏ ‏‮friends‬‏ ‏‮to‬‏ ‏‮Stage‬‏ ‏‮Listen‬‏ ‏‮In‬‏ @@ -8775,7 +8791,7 @@ ‏‮Start‬‏ ‏‮Start‬‏ ‏‮Call‬‏ ‏‮{start}‬‏ ‏‮—‬‏ ‏‮{end}‬‏ - ‏‮$[!!‬‏‏‮{start}‬‏‏‮!!](startHook)‬‏ ‏‮—‬‏ ‏‮{end}‬‏ + ‏‮$[!!‬‏‏‮{start}‬‏‏‮!!](startHook)‬‏ ‏‮—‬‏ ‏‮Ends‬‏ ‏‮{end}‬‏ ‏‮Start‬‏ ‏‮Activities‬‏ ‏‮Start‬‏ ‏‮Event‬‏ ‏‮You‬‏ ‏‮are‬‏ ‏‮about‬‏ ‏‮to‬‏ ‏‮start‬‏ ‏‮this‬‏ ‏‮$[**!!‬‏‏‮{privacyLevel}‬‏‏‮!!**](privacyLevelHook)‬‏ ‏‮event‬‏ @@ -9298,7 +9314,7 @@ ‏‮Thread‬‏ ‏‮settings‬‏ ‏‮have‬‏ ‏‮been‬‏ ‏‮updated.‬‏ ‏‮Started‬‏ ‏‮by‬‏ ‏‮$[](usernameHook)‬‏ ‏‮Sorry,‬‏ ‏‮we‬‏ ‏‮couldn\'t‬‏ ‏‮load‬‏ ‏‮the‬‏ ‏‮first‬‏ ‏‮message‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮thread‬‏ - ‏‮!!‬‏‏‮{username}‬‏‏‮!!‬‏ ‏‮started‬‏ ‏‮a‬‏ ‏‮thread,‬‏ ‏‮!!‬‏‏‮{threadName}‬‏ + ‏‮!!‬‏‏‮{username}‬‏‏‮!!‬‏ ‏‮started‬‏ ‏‮a‬‏ ‏‮thread,‬‏ ‏‮!!‬‏‏‮{threadName}‬‏‏‮!!‬‏ ‏‮Original‬‏ ‏‮message‬‏ ‏‮from‬‏ ‏‮channel‬‏ ‏‮When‬‏ ‏‮the‬‏ ‏‮conversation‬‏ ‏‮is‬‏ ‏‮over,‬‏ ‏‮the‬‏ ‏‮thread‬‏ ‏‮goes‬‏ ‏‮away.‬‏ ‏‮Start‬‏ ‏‮a‬‏ ‏‮thread‬‏ ‏‮from‬‏ ‏‮any‬‏ ‏‮existing‬‏ ‏‮message,‬‏ ‏‮or‬‏ ‏‮click‬‏ ‏‮the‬‏ ‏‮+‬‏ ‏‮icon‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮chat‬‏ ‏‮bar.‬‏ diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index 9030e62525..b656365ffb 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -98,6 +98,7 @@ [çöḿ.ðîšçöŕð.åþþ.ÅþþŠçŕöļļîñĝνîéŵβéĥåVîöŕ one two three four five] [Ţĥîš ḿåý ţåķé å ḿöḿéñţ. one two three] [Åçţîöñš one two] + [ÅçţîVé Ñöŵ one two] [ÅçţîVé öñ Ḿöɓîļé one two three] [ÅçţîVé Ţĥŕéåðš one two three] [Ḿöŕé ÅçţîVé Ţĥŕéåðš one two three] @@ -1042,6 +1043,8 @@ [Î åĝŕéé ţö ţĥé [»{applicationName}« ÉÛĻÅ](öñÇļîçķ) one two three four] [βļåçķ Fŕîðåý Ðéåļ one two three] [βļöçķ one] + [Ŵåñţ ţö ɓļöçķ ţĥéḿ¿ one two three] + [΃ ɓļöçķéð, »{username}« ŵîļļ ɓé ûñåɓļé ţö ḿéššåĝé ýöû. one two three four five] [βļöçķéð one two] [»{count}« ɓļöçķéð one two] [»{count}«] @@ -2235,6 +2238,7 @@ [Ðîšåɓļé Åççöûñţ one two three] [Åŕé ýöû šûŕé ţĥåţ ýöû ŵåñţ ţö ðîšåɓļé ýöûŕ åççöûñţ¿ Ţĥîš ŵîļļ îḿḿéðîåţéļý ļöĝ ýöû öûţ åñð ḿåķé ýöûŕ åççöûñţ îñåççéššîɓļé ţö åñýöñé. one two three four five six seven eight nine ten eleven twelve thirteen] [Šûççéšš¡ Ŵé\'Vé ðîšåɓļéð é-ḿåîļ ñöţîƒîçåţîöñš ƒöŕ ýöû¡ one two three four five six] + [Ţîḿé Öûţ ¡¡»{user}«¡¡ one two] [Ðîšåɓļé Šýñç one two] [Ðîšåɓļîñĝ šýñç ŵîļļ þéŕƒöŕḿ ţĥé šéļéçţéð éхþîŕéð šûɓ ɓéĥåVîöŕ åš îƒ åļļ šûɓš ĥåVé éхþîŕéð. one two three four five six seven eight nine ten] [Ðîšåɓļîñĝ šýñç ŵîļļ þéŕƒöŕḿ ţĥé šéļéçţéð éхþîŕéð ḿéḿɓéŕšĥîþ ɓéĥåVîöŕ åš îƒ åļļ ḿéḿɓéŕš ĥåVé éхþîŕéð. one two three four five six seven eight nine ten eleven] @@ -2393,6 +2397,11 @@ [¡¡»{username}«¡¡ îš þļåýîñĝ one two three] [¡¡»{username}«¡¡ îš ŵåţçĥîñĝ one two three] [Ĵöîñ ÅçţîVîţý one two] + [Ţĥîš šéŕVéŕ ðöéšñ\'ţ ĥåVé åççéšš ţö ţĥé ŕéQûéšţéð åçţîVîţý one two three four five six seven] + [Ţĥîš šéŕVéŕ ĥåš ŕéåçĥéð ţĥé ļîḿîţ öƒ çöñçûŕŕéñţ åçţîVîţîéš ƒöŕ ţĥé çûŕŕéñţ ɓööšţ ļéVéļ one two three four five six seven eight nine] + [Ûñåɓļé ţö ļåûñçĥ åçţîVîţý one two three] + [Ţĥîš šéŕVéŕ ðöéšñ\'ţ ĥåVé å ĥîĝĥ éñöûĝĥ ɓööšţîñĝ ļéVéļ ƒöŕ ţĥé ŕéQûéšţéð åçţîVîţý one two three four five six seven eight nine] + [Fåîļéð ţö Ļåûñçĥ ÅçţîVîţý one two three] [Ļåûñçĥîñĝ åçţîVîţý one two three] [ĻéåVé ÅçţîVîţý one two three] [Ļööķ ƒöŕ ḿöŕé åçţîVîţîéš çöḿîñĝ šööñ¡ one two three four five] @@ -2493,6 +2502,7 @@ [Ţö ḿîñîḿîžé šþåḿ, ḿéḿɓéŕš öƒ ţĥé šéŕVéŕ ḿûšţ ĥåVé å Véŕîƒîéð éḿåîļ ɓéƒöŕé ţĥéý çåñ šéñð ḿéššåĝéš. Ţĥîš ðöéš ñöţ åþþļý ţö ḿéḿɓéŕš ŵîţĥ ŕöļéš. one two three four five six seven eight nine ten eleven twelve thirteen] [νéŕîƒîéð éḿåîļ ŕéQûîŕéð one two three] [Ýöûŕ šéŕVéŕ åļŕéåðý ḿééţš öŕ éхçééðš ţĥé Véŕîƒîçåţîöñ ļéVéļ ŕéQûîŕéḿéñţ. one two three four five six seven eight] + [ŔéḿöVé Ţîḿé Öûţ Fŕöḿ ¡¡»{user}«¡¡ one two three] [Éñåɓļé îñ-ĝåḿé öVéŕļåý. one two three] [Éñåɓļé Ñöîšé Šûþþŕéššîöñ one two three] [Éñåɓļé ñöţîƒîçåţîöñš one two three] @@ -2647,6 +2657,8 @@ [Öþéñ îñ ɓŕöŵšéŕ one two three] [Šĥåŕé ļîñķ one two] [FåVöŕîţé one two] + [Ýöû çåññöţ ĥåVé ḿöŕé ţĥåñ »{count}« ƒåVöŕîţéš. one two three four five] + [Öĥ ñö¡ one two] [Ḿîšçéļļåñéöûš one two] [Ðéšçŕîɓé ýöûŕ îššûé one two three] [Ýöûŕ Κšûé one two] @@ -2998,6 +3010,7 @@ [Ţĥéŕé åŕé ñö þéñðîñĝ ƒŕîéñð ŕéQûéšţš. Ĥéŕé\'š Ŵûḿþûš ƒöŕ ñöŵ. one two three four five six seven] [Ñö þéñðîñĝ ƒŕîéñðš one two three] [Ţŕý åððîñĝ å ƒŕîéñð ŵîţĥ ţĥéîŕ ûšéŕñåḿé, öŕ šçåñ ţö šéé ŵĥö îš ñéåŕɓý. one two three four five six seven eight] + [Ţĥéŕé åŕé ñö þéñðîñĝ ƒŕîéñð šûĝĝéšţîöñš. Ĥéŕé\'š Ŵûḿþûš ƒöŕ ñöŵ. one two three four five six seven] [Fŕîéñð Šûĝĝéšţîöñš — »{count}« one two three] [Öƒƒļîñé — »{offline}« one two] [Öñļîñé — »{online}« one two] @@ -3018,6 +3031,7 @@ [Åļļ one] [Öñļîñé one two] [Þéñðîñĝ one two] + [Šûĝĝéšţîöñš one two] [Šĥåŕé one] [Šçåññîñĝ ţĥé åîŕŵåVéš ƒöŕ ƒŕîéñðš. Ḿåķé šûŕé ýöûŕ ƒŕîéñðš åŕé öñ ţĥîš þåĝé åñð šçåññîñĝ ţöö. one two three four five six seven eight nine ten] [Ḿåķé šûŕé ýöûŕ ƒŕîéñðš åŕé šçåññîñĝ ţöö¡ one two three four five] @@ -3460,6 +3474,7 @@ [Ñö, ĵûšţ ðîšçöññéçţ one two three] [Ýéš, éñð ţĥé éVéñţ one two three] [Ðö ýöû ŵåñţ ţö åļšö éñð ţĥé éVéñţ¿ one two three four] + [Éñðš åţ »{time}« one two] [Åŕé ýöû šûŕé ýöû ŵåñţ ţö éñð ţĥé éVéñţ¿ one two three four five] [»{count}« Îñţéŕéšţéð one two] [»{count}« îñţéŕéšţéð one two] @@ -3541,7 +3556,7 @@ [Föļðéŕ šéţţîñĝš šåVéð¡ one two three] [Ýöû çåñ çĥåñĝé ĥöŵ öţĥéŕš šéé ýöû îñšîðé ţĥîš šéŕVéŕ öñļý (¡¡»{guildName}«¡¡) ɓý šéţţîñĝ å šéŕ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] - [ŠéŕVéŕ Þŕöƒîļé - ¡¡»{guildName}«¡¡ 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éŕš, ûñļöçķ åñîḿåţéð å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] @@ -3954,7 +3969,7 @@ [**Ţŕý åñ åñîḿåţéð ɓåññéŕ¡** Çĥööšé å ĜÎF ƒŕöḿ Ţéñöŕ ƒöŕ ýöûŕ šéŕVéŕ ɓåññéŕ one two three four five six seven eight] [**ÑÉŴ¡** βööšţ ţö ĻéVéļ 3 ţö ûñļöçķ åñîḿåţéð šéŕVéŕ ɓåññéŕš. one two three four five six seven] [**ÑÉŴ¡** βööšţ ţö ţĥé Çöḿḿûñîţîéš þļåñ ţö ûñļöçķ åñîḿåţéð šéŕVéŕ ɓåññéŕš. one two three four five six seven eight] - [Ţŕý îţ ñöŵ¡ one two] + [Ţŕý îţ¡ one two] [€[**¡¡»{user}«¡¡**](ûšéŕĤööķ) çŕéåţéð åñ åññöûñçéḿéñţ ţĥŕéåð €[**¡¡»{target}«¡¡**](ţåŕĝéţĤööķ) one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [€[**¡¡»{user}«¡¡**](ûšéŕĤööķ) åððéð €[**¡¡»{target}«¡¡**](ţåŕĝéţĤööķ) ţö ţĥé šéŕVéŕ one two three four five six seven eight nine ten eleven twelve thirteen] [Çĥåñĝéð ţĥé ɓîţŕåţé ţö **¡¡»{newValue}«¡¡** one two three four] @@ -6072,8 +6087,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] @@ -6934,7 +6949,7 @@ [Ĝéţ çööļ ŕéŵåŕðš ƒöŕ ɓéçöḿîñĝ å βööšţéŕ¡ one two three four five] [ŠéŕVéŕ βööšţ Ḿöñţĥļý one two three] [ŠéŕVéŕ βööšţ Ýéåŕļý one two three] - [Ţĥîš îš å βööšţîñĝ ÞŕéVîéŵ one two three four] + [Ţĥîš îš å βööšţîñĝ þŕéVîéŵ one two three four] [Ýöû ñééð **»{number}«** ţö ûñļöçķ ¡¡»{tier}«¡¡ one two three four] [»{subscribers}«/»{numRequired}« one] [Ŕéåðý ţö βööšţ ţĥîš šéŕVéŕ¿ one two three four] @@ -7604,7 +7619,6 @@ [ŔéḿöVé Ŕéåçţîöñ one two three] [ŔéḿöVé ¡¡»{name}«¡¡ one two] [ŔéḿöVé Ŕöļé one two] - [ŔéḿöVé Ţîḿé Öûţ Fŕöḿ ¡¡»{user}«¡¡ one two three] [ŔéḿöVé ¡¡»{user}«¡¡ ƒŕöḿ Ţĥŕéåð one two three] [ŔéḿöVé νåñîţý ÛŔĻ one two three] [Šĥöŵ ŵéɓšîţé þŕéVîéŵ îñƒö ƒŕöḿ ļîñķš þåšţéð îñţö çĥåţ one two three four five six] @@ -8324,7 +8338,7 @@ [Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ šéñð ţéхţ-ţö-šþééçĥ ḿéššåĝéš ɓý šţåŕţîñĝ å ḿéššåĝé ŵîţĥ /ţţš. Ţĥéšé ḿéššåĝéš çåñ ɓé ĥéåŕð ɓý éVéŕýöñé ƒöçûšéð öñ ţĥé çĥåññéļ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [Šéñð å ŵåVé one two] [Šéñðîñĝ îñVîţé… one two three] - [Ĝîƒţ šöḿéöñé Ñîţŕö ţö ĝîVé åççéšš ţö ĝåḿéš, þéŕķš, šéŕVéŕ ɓööšţîñĝ ÅÑÐ šûþéŕ þöŵéŕéð çĥåţ ƒéåţûŕéš. one two three four five six seven eight nine ten eleven] + [Ĝîƒţ šöḿéöñé Ñîţŕö ţö ĝîVé åççéšš ţö šþéçîåļ þéŕķš, šéŕVéŕ ɓööšţîñĝ ÅÑÐ šûþéŕ þöŵéŕéð çĥåţ ƒéåţûŕéš. one two three four five six seven eight nine ten eleven] [ĜîVé ţĥé ĝîƒţ öƒ Ñîţŕö one two three] [ŠéŕVéŕ Ðéåƒéñ one two] [ŠéŕVéŕ Ðéåƒéñéð one two three] @@ -8596,6 +8610,7 @@ [Ļîļ Ýåçĥţý one two] [Šöûñðš one two] [[Öŕîĝîñåļ Ḿéššåĝé Ðéļéţéð] one two three four] + [βļöçķéð »{username}« one two] [Šþéåķ one] [Šþéåķ Ḿéššåĝé one two] [¡¡»{name}«¡¡ - Šþéåķéŕ one two three] @@ -8647,6 +8662,7 @@ [Ţĥîš öVéŕŕîðé îš çûŕŕéñţļý ðîšåɓļéð ƒöŕ Šţåĝé çĥåññéļš. one two three four five six seven] [Ţĥé šéţţîñĝ îš çûŕŕéñţļý ðîšåɓļéð ƒöŕ Šţåĝé Çĥåññéļš. one two three four five six] [Å Vöîçé çĥåññéļ ƒöŕ ĥöšţîñĝ éVéñţš ŵîţĥ åñ åûðîéñçé one two three four five six] + [Ĥåþþéñîñĝ Ñöŵ one two] [Öŕ, šéñð å Šţåĝé îñVîţé ļîñķ ţö å ƒŕîéñð one two three four five] [ÎñVîţé ƒŕîéñðš ţö Šţåĝé one two three] [Ļîšţéñ Îñ one two] @@ -8775,7 +8791,7 @@ [Šţåŕţ one] [Šţåŕţ Çåļļ one two] [»{start}« — »{end}« one] - [€[¡¡»{start}«¡¡](šţåŕţĤööķ) — »{end}« one two three] + [€[¡¡»{start}«¡¡](šţåŕţĤööķ) — Éñðš »{end}« one two three four] [Šţåŕţ ÅçţîVîţîéš one two three] [Šţåŕţ ÉVéñţ one two] [Ýöû åŕé åɓöûţ ţö šţåŕţ ţĥîš €[**¡¡»{privacyLevel}«¡¡**](þŕîVåçýĻéVéļĤööķ) éVéñţ one two three four five six seven] @@ -9298,7 +9314,7 @@ [Ţĥŕéåð šéţţîñĝš ĥåVé ɓééñ ûþðåţéð. one two three four] [Šţåŕţéð ɓý €[](ûšéŕñåḿéĤööķ) one two three four] [Šöŕŕý, ŵé çöûļðñ\'ţ ļöåð ţĥé ƒîŕšţ ḿéššåĝé îñ ţĥîš ţĥŕéåð one two three four five six seven] - [¡¡»{username}«¡¡ šţåŕţéð å ţĥŕéåð, ¡¡»{threadName}« one two three] + [¡¡»{username}«¡¡ šţåŕţéð å ţĥŕéåð, ¡¡»{threadName}«¡¡ one two three four] [Öŕîĝîñåļ ḿéššåĝé ƒŕöḿ çĥåññéļ one two three four] [Ŵĥéñ ţĥé çöñVéŕšåţîöñ îš öVéŕ, ţĥé ţĥŕéåð ĝöéš åŵåý. one two three four five six] [Šţåŕţ å ţĥŕéåð ƒŕöḿ åñý éхîšţîñĝ ḿéššåĝé, öŕ çļîçķ ţĥé + îçöñ îñ ţĥé çĥåţ ɓåŕ. one two three four five six seven eight nine] diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index c17de80a99..457fc4290b 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -14558,10095 +14558,10111 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b5866386ad..236836e4ac 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -98,6 +98,7 @@ com.discord.app.AppScrollingViewBehavior This may take a moment. Actions + Active Now Active on Mobile Active Threads More Active Threads @@ -1043,6 +1044,8 @@ I agree to the [{applicationName} EULA](onClick) Black Friday Deal Block + Want to block them? + If blocked, {username} will be unable to message you. Blocked {count} blocked {count} @@ -1487,7 +1490,7 @@ Select a color Transparency Use Default - a38aa8149f1240e4a61c9aa3bc7a85d1 + e46a8305e164499398a164eac80ee55f Coming Soon Slash command application {applicationName} {applicationName} application @@ -2240,6 +2243,7 @@ Disable Account Are you sure that you want to disable your account? This will immediately log you out and make your account inaccessible to anyone. Success! We\'ve disabled e-mail notifications for you! + Time Out !!{user}!! Disable Sync Disabling sync will perform the selected expired sub behavior as if all subs have expired. Disabling sync will perform the selected expired membership behavior as if all members have expired. @@ -2399,6 +2403,11 @@ !!{username}!! is playing !!{username}!! is watching Join Activity + This server doesn\'t have access to the requested activity + This server has reached the limit of concurrent activities for the current boost level + Unable to launch activity + This server doesn\'t have a high enough boosting level for the requested activity + Failed to Launch Activity Launching activity Leave Activity Look for more activities coming soon! @@ -2499,6 +2508,7 @@ To minimize spam, members of the server must have a verified email before they can send messages. This does not apply to members with roles. Verified email required Your server already meets or exceeds the verification level requirement. + Remove Time Out From !!{user}!! Enable in-game overlay. Enable Noise Suppression Enable notifications @@ -2657,6 +2667,8 @@ Open in browser Share link Favorite + You cannot have more than {count} favorites. + Oh no! Miscellaneous Describe your issue Your Issue @@ -3009,6 +3021,7 @@ There are no pending friend requests. Here\'s Wumpus for now. No pending friends Try adding a friend with their username, or scan to see who is nearby. + There are no pending friend suggestions. Here\'s Wumpus for now. Friend Suggestions — {count} Offline — {offline} Online — {online} @@ -3029,6 +3042,7 @@ All Online Pending + Suggestions Share Scanning the airwaves for friends. Make sure your friends are on this page and scanning too. Make sure your friends are scanning too! @@ -3476,6 +3490,7 @@ No, just disconnect Yes, end the event Do you want to also end the event? + Ends at {time} Are you sure you want to end the event? {count} Interested {count} interested @@ -3557,7 +3572,7 @@ Folder settings saved! You can change how others see you inside this server only (!!{guildName}!!) by setting a server profile. Anything not set here will show your default user profile. Server Profile Banner - Server Profile - !!{guildName}!! + Server Profile - $[](guildIconHook) !!{guildName}!! Set a different avatar, profile banner, and about me in each of your servers and more with [Discord Nitro!](onAndMore) 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? @@ -3970,7 +3985,7 @@ **Try an animated banner!** Choose a GIF from Tenor for your server banner **NEW!** Boost to Level 3 to unlock animated server banners. **NEW!** Boost to the Communities plan to unlock animated server banners. - Try it now! + Try it! $[**!!{user}!!**](userHook) created an announcement thread $[**!!{target}!!**](targetHook) $[**!!{user}!!**](userHook) added $[**!!{target}!!**](targetHook) to the server Changed the bitrate to **!!{newValue}!!** @@ -6091,8 +6106,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 @@ -6960,7 +6975,7 @@ Get cool rewards for becoming a Booster! Server Boost Monthly Server Boost Yearly - This is a Boosting Preview + This is a Boosting preview You need **{number}** to unlock !!{tier}!! {subscribers}/{numRequired} Ready to Boost this server? @@ -7631,7 +7646,6 @@ Remove Reaction Remove !!{name}!! Remove Role - Remove Time Out From !!{user}!! Remove !!{user}!! from Thread Remove Vanity URL Show website preview info from links pasted into chat @@ -8351,7 +8365,7 @@ Members with this permission can send text-to-speech messages by starting a message with /tts. These messages can be heard by everyone focused on the channel. Send a wave Sending invite… - Gift someone Nitro to give access to games, perks, server boosting AND super powered chat features. + Gift someone Nitro to give access to special perks, server boosting AND super powered chat features. Give the gift of Nitro Server Deafen Server Deafened @@ -8623,6 +8637,7 @@ Lil Yachty Sounds [Original Message Deleted] + Blocked {username} Speak Speak Message !!{name}!! - Speaker @@ -8674,6 +8689,7 @@ This override is currently disabled for Stage channels. The setting is currently disabled for Stage Channels. A voice channel for hosting events with an audience + Happening Now Or, send a Stage invite link to a friend Invite friends to Stage Listen In @@ -8802,7 +8818,7 @@ Start Start Call {start} — {end} - $[!!{start}!!](startHook) — {end} + $[!!{start}!!](startHook) — Ends {end} Start Activities Start Event You are about to start this $[**!!{privacyLevel}!!**](privacyLevelHook) event @@ -9325,7 +9341,7 @@ Thread settings have been updated. Started by $[](usernameHook) Sorry, we couldn\'t load the first message in this thread - !!{username}!! started a thread, !!{threadName} + !!{username}!! started a thread, !!{threadName}!! Original message from channel When the conversation is over, the thread goes away. Start a thread from any existing message, or click the + icon in the chat bar.