ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #467 from pangeachat/filter-analytics-events

Browse source 
filter out analytics events from syncs. hide space analytics
This commit is contained in:
ggurdin 2024-07-15 14:08:01 -04:00 • committed by GitHub
commit 24610fe0ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 54 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/config/routes.dart
View file

@ -42,9 +42,6 @@ import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import '../pangea/pages/analytics/space_analytics/space_analytics.dart';
import '../pangea/pages/analytics/space_list/space_list.dart';
abstract class AppRoutes {
static FutureOr<String?> loggedInRedirect(
BuildContext context,
@ -176,27 +173,27 @@ abstract class AppRoutes {
),
redirect: loggedOutRedirect,
),
GoRoute(
path: 'analytics',
pageBuilder: (context, state) => defaultPageBuilder(
context,
state,
const AnalyticsSpaceList(),
),
redirect: loggedOutRedirect,
routes: [
GoRoute(
path: ':spaceid',
pageBuilder: (context, state) => defaultPageBuilder(
context,
state,
const SpaceAnalyticsPage(
selectedView: BarChartViewSelection.messages,
),
),
),
],
),
// GoRoute(
// path: 'analytics',
// pageBuilder: (context, state) => defaultPageBuilder(
// context,
// state,
// const AnalyticsSpaceList(),
// ),
// redirect: loggedOutRedirect,
// routes: [
// GoRoute(
// path: ':spaceid',
// pageBuilder: (context, state) => defaultPageBuilder(
// context,
// state,
// const SpaceAnalyticsPage(
// selectedView: BarChartViewSelection.messages,
// ),
// ),
// ),
// ],
// ),
// Pangea#
GoRoute(
path: 'archive',

22
lib/pages/chat_details/chat_details_view.dart
View file

@ -263,28 +263,6 @@ class ChatDetailsView extends StatelessWidget {
controller: controller,
),
// Pangea#
if (room.isSpace && room.isRoomAdmin)
ListTile(
title: Text(
L10n.of(context)!.spaceAnalytics,
style: TextStyle(
color:
Theme.of(context).colorScheme.secondary,
fontWeight: FontWeight.bold,
),
),
leading: CircleAvatar(
backgroundColor:
Theme.of(context).scaffoldBackgroundColor,
foregroundColor: iconColor,
child: const Icon(
Icons.analytics_outlined,
),
),
onTap: () => context.go(
'/rooms/analytics/${room.id}',
),
),
// commenting out language settings in spaces for now
// if (room.languageSettings != null && room.isRoomAdmin)
// LanguageSettings(

39
lib/pages/chat_list/client_chooser_button.dart
View file

@ -1,5 +1,4 @@
import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:fluffychat/pangea/constants/class_default_values.dart';
import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
import 'package:fluffychat/pangea/utils/find_conversation_partner_dialog.dart';
import 'package:fluffychat/pangea/utils/logout.dart';
@ -53,21 +52,21 @@ class ClientChooserButton extends StatelessWidget {
],
),
),
PopupMenuItem(
enabled: matrix.client.rooms.any(
(room) =>
room.isSpace &&
room.ownPowerLevel >= ClassDefaultValues.powerLevelOfAdmin,
),
value: SettingsAction.spaceAnalytics,
child: Row(
children: [
const Icon(Icons.analytics_outlined),
const SizedBox(width: 18),
Expanded(child: Text(L10n.of(context)!.spaceAnalytics)),
],
),
),
// PopupMenuItem(
// enabled: matrix.client.rooms.any(
// (room) =>
// room.isSpace &&
// room.ownPowerLevel >= ClassDefaultValues.powerLevelOfAdmin,
// ),
// value: SettingsAction.spaceAnalytics,
// child: Row(
// children: [
// const Icon(Icons.analytics_outlined),
// const SizedBox(width: 18),
// Expanded(child: Text(L10n.of(context)!.spaceAnalytics)),
// ],
// ),
// ),
PopupMenuItem(
enabled: matrix.client.rooms.any(
(room) => !room.isSpace && !room.isArchived && !room.isAnalyticsRoom,
@ -402,9 +401,9 @@ class ClientChooserButton extends StatelessWidget {
controller.pangeaController,
);
break;
case SettingsAction.spaceAnalytics:
context.go('/rooms/analytics');
break;
// case SettingsAction.spaceAnalytics:
// context.go('/rooms/analytics');
// break;
case SettingsAction.myAnalytics:
context.go('/rooms/mylearning');
break;
@ -497,7 +496,7 @@ enum SettingsAction {
// #Pangea
learning,
joinWithClassCode,
spaceAnalytics,
// spaceAnalytics,
myAnalytics,
findAConversationPartner,
logout,

13
lib/utils/client_manager.dart
View file

@ -132,6 +132,19 @@ abstract class ClientManager {
customImageResizer: PlatformInfos.isMobile ? customImageResizer : null,
defaultNetworkRequestTimeout: const Duration(minutes: 30),
enableDehydratedDevices: true,
// #Pangea
syncFilter: Filter(
room: RoomFilter(
state: StateFilter(lazyLoadMembers: true),
timeline: StateFilter(
notTypes: [
PangeaEventTypes.construct,
PangeaEventTypes.summaryAnalytics,
],
),
),
),
// Pangea#
);
}

1
lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart
View file

@ -40,6 +40,7 @@ extension IsStateExtension on Event {
}.contains(type);
// #Pangea
// we're filtering out some state events that we don't want to render
static const Set<String> importantStateEvents = {
EventTypes.Encryption,
EventTypes.RoomCreate,