changeset 52:7df8ec497281

remove bounces
author Franklin Schmidt <fschmidt@gmail.com>
date Fri, 02 Jul 2021 00:36:59 -0600
parents f88ed76ca757
children 56accc959f8c
files src/nabble/model/UserImpl.java
diffstat 1 files changed, 1 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/nabble/model/UserImpl.java	Fri Jul 02 00:32:31 2021 -0600
+++ b/src/nabble/model/UserImpl.java	Fri Jul 02 00:36:59 2021 -0600
@@ -58,7 +58,6 @@
 	private Date registered;
 	private boolean noArchive;
 	private Message signature = null;
-	private int bounces;
 
 	private UserImpl(SiteKey siteKey,LongKey key,ResultSet rs)
 		throws SQLException
@@ -76,7 +75,6 @@
 			Message.Format signatureFormat = Message.Format.getMessageFormat( signatureFormatS.charAt(0) );
 			signature = new Message(signatureRaw,signatureFormat);
 		}
-		bounces = rs.getInt("bounces");
 		for( ExtensionFactory<User,?> factory : extensionFactories ) {
 			Object obj = factory.construct(this,rs);
 			if( obj != null )
@@ -498,7 +496,6 @@
 	}
 
 	public Subscription subscribe(Node node,Subscription.To to,Subscription.Type type) {
-		clearBounces();
 		Subscription subscription = getSubscription(node);
 		if( subscription != null ) {
 			subscription.setTo(to);
@@ -903,27 +900,8 @@
 		return Long.toString(getId());
 	}
 
-	private void clearBounces() {
-		if( bounces==0 )
-			return;
-		bounces = 0;
-		record.fields().put("bounces",DbNull.INTEGER);
-		record.update();
-	}
-
-	void bounced() {
-		record.fields().put("bounces",++bounces);
-		record.update();
-	}
-
-	int getBounces() {
-		return bounces;
-	}
-
-	private static final int bounceLimit = Init.get("bounceLimit",100);
-
 	boolean isAutoUnsubscribe() {
-		return isDeactivated() || bounces > bounceLimit;
+		return isDeactivated();
 	}