Bugfix, cleanup

VERSION

-0.6.1
+0.6.2

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},
     );

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},
                     },

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(

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";