reorg can_user_run inner code
This commit is contained in:
parent
017d2426d2
commit
b78a2cd2b9
1 changed files with 16 additions and 22 deletions
|
@ -558,33 +558,27 @@ impl IdentityManager {
|
||||||
println!("Read lock on : Special_Roles_User"); // <-- after this is slightly different between working and problem
|
println!("Read lock on : Special_Roles_User"); // <-- after this is slightly different between working and problem
|
||||||
let mut roleslock = roleslock.write().await;
|
let mut roleslock = roleslock.write().await;
|
||||||
match (*roleslock).get(&usr.to_lowercase()) {
|
match (*roleslock).get(&usr.to_lowercase()) {
|
||||||
Some(usrroles) => { // <-- working got to this point
|
Some(usrroles) if
|
||||||
println!("contains mod : {}", usrroles.read().await.contains(&UserRole::Mod(channelname.clone())));
|
usrroles.read().await.contains(&UserRole::Mod(channelname.clone())) ||
|
||||||
println!("contains supmod : {}", usrroles.read().await.contains(&UserRole::SupMod(channelname.clone())));
|
usrroles.read().await.contains(&UserRole::SupMod(channelname.clone())) => { // <-- working got to this point
|
||||||
if usrroles.read().await.contains(&UserRole::Mod(channelname.clone())) ||
|
// println!("contains mod : {}", usrroles.read().await.contains(&UserRole::Mod(channelname.clone())));
|
||||||
usrroles.read().await.contains(&UserRole::SupMod(channelname.clone())) {
|
// println!("contains supmod : {}", usrroles.read().await.contains(&UserRole::SupMod(channelname.clone())));
|
||||||
|
// if usrroles.read().await.contains(&UserRole::Mod(channelname.clone())) ||
|
||||||
|
// usrroles.read().await.contains(&UserRole::SupMod(channelname.clone())) {
|
||||||
// Do nothing - this is expected
|
// Do nothing - this is expected
|
||||||
println!("Already a mod in roles");
|
println!("Already a mod in roles");
|
||||||
} else {
|
|
||||||
// in this case, they have a ChatBadge::Mod but should have this for the channel
|
|
||||||
// let mut a = usrroles;
|
|
||||||
// usrroles.push(UserRole::Mod(channelname.clone()));
|
|
||||||
// a.push(UserRole::Mod(channelname.clone()));
|
|
||||||
println!("Was in the else loop");
|
|
||||||
|
|
||||||
// let a = &*self;
|
// let a = &*self;
|
||||||
// let mut lock = a.special_roles_users.write().await;
|
// let mut lock = a.special_roles_users.write().await;
|
||||||
println!("lock created > adding with a mod role o7");
|
// println!("lock created > adding with a mod role o7");
|
||||||
roleslock.get_mut(&usr.to_lowercase())
|
// roleslock.get_mut(&usr.to_lowercase())
|
||||||
// .expect("ERROR")
|
// // .expect("ERROR")
|
||||||
.unwrap()
|
// .unwrap()
|
||||||
.write().await
|
// .write().await
|
||||||
// .get_mut()
|
// // .get_mut()
|
||||||
.push(UserRole::Mod(channelname.clone()));
|
// .push(UserRole::Mod(channelname.clone()));
|
||||||
// println!("debug special roles : {:?}",self.special_roles_users);
|
// println!("debug special roles : {:?}",self.special_roles_users);
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
|
||||||
_ => {
|
_ => {
|
||||||
println!("lock created > adding with a mod role o7");
|
println!("lock created > adding with a mod role o7");
|
||||||
roleslock.get_mut(&usr.to_lowercase())
|
roleslock.get_mut(&usr.to_lowercase())
|
||||||
|
|
Loading…
Reference in a new issue