From 3d7d5857e37b215ea6aba450b0c787313f1963a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Fri, 2 Dec 2022 00:32:43 +0100
Subject: [PATCH] Bugfix, cleanup
---
VERSION | 2 +-
lib/SeMeet/Controller/Auth.pm | 1 -
lib/SeMeet/Helpers/Core.pm | 1 -
lib/SeMeet/Schema/Result/User.pm | 12 ++++--------
sql/migrations.sql | 3 +++
5 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/VERSION b/VERSION
index ee6cdce..b616048 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.1
+0.6.2
diff --git a/lib/SeMeet/Controller/Auth.pm b/lib/SeMeet/Controller/Auth.pm
index 503bbca..fa7f1d6 100644
--- a/lib/SeMeet/Controller/Auth.pm
+++ b/lib/SeMeet/Controller/Auth.pm
@@ -10,7 +10,6 @@ sub callback ($c) {
my %user = (
uuid => $claims->{sub},
- octid => $octopus_user->{id},
username => $claims->{preferred_username},
displayname => $octopus_user->{displayname} || $claims->{name},
);
diff --git a/lib/SeMeet/Helpers/Core.pm b/lib/SeMeet/Helpers/Core.pm
index 05d4277..bd8d525 100644
--- a/lib/SeMeet/Helpers/Core.pm
+++ b/lib/SeMeet/Helpers/Core.pm
@@ -116,7 +116,6 @@ sub register {
$user = $c->schema->resultset('User')->find_or_create(
{
uuid => $uuid,
- octid => $octopus_user->{id},
username => $octopus_user->{username},
displayname => $octopus_user->{displayname},
},
diff --git a/lib/SeMeet/Schema/Result/User.pm b/lib/SeMeet/Schema/Result/User.pm
index f84044b..23d3ff6 100644
--- a/lib/SeMeet/Schema/Result/User.pm
+++ b/lib/SeMeet/Schema/Result/User.pm
@@ -23,7 +23,6 @@ __PACKAGE__->add_columns(
},
qw(
uuid
- octid
username
displayname
),
@@ -35,10 +34,6 @@ __PACKAGE__->add_unique_constraint(
'uuid' => [qw(uuid)]
);
-__PACKAGE__->add_unique_constraint(
- 'octid' => [qw(octid)]
-);
-
__PACKAGE__->add_unique_constraint(
'username' => [qw(username)]
);
@@ -80,10 +75,11 @@ sub meet_token {
my $moderator = 0;
- $moderator = 1 if $meet->owner_id == $self->id;
+# $moderator = 1 if $meet->owner_id == $self->id;
- $moderator ||= $meet->moderators({
- octid => $self->octid
+ $moderator ||= $meet->meet_users({
+ id => $self->id,
+ is_moderator => 't',
})->count;
return Mojo::JWT->new(
diff --git a/sql/migrations.sql b/sql/migrations.sql
index 8e1e977..968a2e3 100644
--- a/sql/migrations.sql
+++ b/sql/migrations.sql
@@ -81,3 +81,6 @@ from "meets_users"
join "users" on ("users"."id" = "meets_users"."user_id")
;
+-- 6 up
+drop table "moderators";
+alter table "users" drop column "octid";
--
GitLab